Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update documentation to match ROCm #142

Merged
merged 13 commits into from
Feb 21, 2024

Conversation

lawruble13
Copy link
Collaborator

@lawruble13 lawruble13 commented Aug 18, 2023

The rocm-cmake documentation should be updated to match the documentation in the rest of ROCm, and be included on rocm.docs.amd.com.

@lawruble13 lawruble13 requested a review from samjwu August 18, 2023 20:33
Copy link
Member

@samjwu samjwu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. One thing is that it will need an RTD config.
eg: https://github.com/RadeonOpenCompute/ROCm/blob/develop/.readthedocs.yaml

For the conf.py, will likely want to call the ROCmDocs constructor (https://github.com/RadeonOpenCompute/rocm-docs-core#use)
eg: https://github.com/RadeonOpenCompute/ROCm/blob/develop/docs/conf.py

@lawruble13
Copy link
Collaborator Author

lawruble13 commented Aug 18, 2023

One thing is that it will need an RTD config.

Thanks! Couldn't remember how to specify the build configuration.

For the conf.py, will likely want to call the ROCmDocs constructor (https://github.com/RadeonOpenCompute/rocm-docs-core#use)

Noting in advance that I wrote that particular usage guideline, I'm actually of the opinion that we should transition to using rocm-docs-core as the Sphinx extension/theme combination that it is rather than an object that we inject into the global scope. That standard usage guideline does almost exactly what I've done here, although there is a small amount of logic surrounding the use of Doxygen. Given that this project doesn't use doxygen, this is equivalent to the usage recommendation in rocm-docs-core.

@cgmb
Copy link
Collaborator

cgmb commented Aug 18, 2023

I'm actually of the opinion that we should transition to using rocm-docs-core as the Sphinx extension/theme combination that it is rather than an object that we inject into the global scope.

+1

@samjwu
Copy link
Member

samjwu commented Sep 1, 2023

RTD Builds for PRs have been enabled for this project. They should appear in the GitHub commit status and checks the next time this PR is updated. If not, closing and reopening the PR has worked in the past for triggering PR doc builds.

@saadrahim
Copy link
Member

@lawruble13 can this be merged soon? We need documentation for rocm-cmake soon.

@samjwu
Copy link
Member

samjwu commented Jan 17, 2024

lawruble13#3 adds the yaml configuration for building on ReadtheDocs as well as some other changes from ROCm/rocm-docs-core#330

@lawruble13 lawruble13 marked this pull request as ready for review January 18, 2024 20:29
Copy link
Collaborator

@cgmb cgmb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think my only concern is that the src directory name ends up in the user-visible URL. If we can mitigate that, this is perfect.

@pfultz2
Copy link
Collaborator

pfultz2 commented Feb 1, 2024

I think my only concern is that the src directory name ends up in the user-visible URL. If we can mitigate that, this is perfect.

To do that we would need to move the conf.py to the src directory, I believe. I dont know if thats an issue or not. @samjwu Is there an issue with moving this file as well?

@samjwu
Copy link
Member

samjwu commented Feb 2, 2024

I think my only concern is that the src directory name ends up in the user-visible URL. If we can mitigate that, this is perfect.

To do that we would need to move the conf.py to the src directory, I believe. I dont know if thats an issue or not. @samjwu Is there an issue with moving this file as well?

It's preferable to keep a consistent doc structure among the projects, but it's possible to move it. I am not sure if what would break rocm_add_sphinx_doc though. @lawruble13 thoughts?

The external_toc_path and path to CMakeLists.txt in conf.py and sphinx.configuration in .readthedocs.yaml (and entries in _toc.yml.in) would have to be updated to match the new structure.

@cgmb
Copy link
Collaborator

cgmb commented Feb 7, 2024

It's a bit off-topic, but why are we using external_toc again? Does rocm-docs-core need to do something with it?

@samjwu
Copy link
Member

samjwu commented Feb 13, 2024

It's a bit off-topic, but why are we using external_toc again? Does rocm-docs-core need to do something with it?

rocm-docs-core has it as a dependency.

The main advantage is ease of managing table of contents as they are defined in a single yaml file, compared to having toctrees in possibly multiple files

@lawruble13 lawruble13 requested a review from a team as a code owner February 15, 2024 21:52
@pfultz2
Copy link
Collaborator

pfultz2 commented Feb 15, 2024

compared to having toctrees in possibly multiple files

Toctrees seem easier to manage as they are automatically generated from the included files.

Copy link
Collaborator

@cgmb cgmb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lawruble13, there seems to be both _toc.yml and _toc.yml.in?

@lawruble13 lawruble13 merged commit f4fbce3 into ROCm:develop Feb 21, 2024
8 checks passed
@lawruble13 lawruble13 deleted the documentation-update branch February 21, 2024 18:52
samjwu added a commit that referenced this pull request Apr 11, 2024
samjwu added a commit that referenced this pull request Apr 11, 2024
* Update version number and changelog for ROCm 6.1

* Update documentation to match ROCm (#142)

* Update documentation requirements files

* Disable docsphinx test on macOS (#167)

---------

Co-authored-by: Sam Wu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants