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

Publish Developer Guide #673

Merged
merged 23 commits into from
Sep 30, 2022

Conversation

harrism
Copy link
Member

@harrism harrism commented Sep 14, 2022

Description

This PR mimics rapidsai/cudf#11475 to add libcuspatial's C++ developer guide to the rendered Doxygen HTML docs. See that PR for detailed discussion.

Contributes to #598 . Closes #235

Note that this PR depends on #672 and #667 so the changed files will include changes from those PRs until they are merged.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@harrism harrism added 3 - Ready for Review Ready for review by team doc Documentation non-breaking Non-breaking change labels Sep 14, 2022
@harrism harrism requested a review from vyasr September 14, 2022 10:32
@harrism harrism requested a review from a team as a code owner September 14, 2022 10:32
@harrism harrism self-assigned this Sep 14, 2022
@github-actions github-actions bot added the libcuspatial Relates to the cuSpatial C++ library label Sep 14, 2022
@harrism harrism requested review from thomcom and isVoid and removed request for zhangjianting September 20, 2022 01:57
@harrism harrism requested a review from a team as a code owner September 20, 2022 04:24
@github-actions github-actions bot added the gpuCI Related to Continuous Integration / Automation label Sep 20, 2022
@harrism harrism mentioned this pull request Sep 20, 2022
3 tasks
Comment on lines 50 to 51
sed_runner "s|\(TAGFILES.*librmm/\).*|\1${NEXT_SHORT_TAG}|" cpp/doxygen/Doxyfile
sed_runner "s|\(TAGFILES.*libcudf/\).*|\1${NEXT_SHORT_TAG}|" cpp/doxygen/Doxyfile
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
sed_runner "s|\(TAGFILES.*librmm/\).*|\1${NEXT_SHORT_TAG}|" cpp/doxygen/Doxyfile
sed_runner "s|\(TAGFILES.*libcudf/\).*|\1${NEXT_SHORT_TAG}|" cpp/doxygen/Doxyfile
sed_runner "/TAGFILES/ s|[0-9]\+.[0-9]\+|${NEXT_SHORT_TAG}|g" cpp/doxygen/Doxyfile

The original changes here didn't work for me when I tested them locally. This suggested change seems to do the trick. You can verify this locally by running bash ci/release/update-version.sh 22.10.00 and verifying the results.

cpp/doxygen/developer_guide/BENCHMARKING.md Outdated Show resolved Hide resolved
cpp/doxygen/developer_guide/DOCUMENTATION.md Outdated Show resolved Hide resolved
| \@defgroup | For use only in [doxygen_groups.h](../include/doxygen_groups.h) and should include the group's title. |
| \@ingroup | Use inside individual doxygen block comments for declaration statements in a header file. |
| \@addtogroup | Use instead of \@ingroup for multiple declarations in the same file within a namespace declaration. Do not specify a group title. |
| `@{ ... @}` | Use only with \@addtogroup. |
Copy link
Contributor

Choose a reason for hiding this comment

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

I think a list of the groups in doxygen_groups.h and their purpose might be appropriate here. Or a link to it telling the user to go read them.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

I just focused on reviewing the changes to doxygen files and the associated scripts. Everything there looks fine, and the link added to the DEVELOPER_GUIDE.md should be sufficient for the built documentation to render appropriately. Probably worth trying to build locally once (in case you haven't yet) just to be sure, but I think this looks good.

@@ -45,3 +45,7 @@ sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cma
for FILE in conda/environments/*.yml; do
sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" ${FILE};
done

# Doxyfile update
sed_runner "/PROJECT_NUMBER/ s|[0-9]\+.[0-9]\+|${NEXT_SHORT_TAG}|g" cpp/doxygen/Doxyfile
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
sed_runner "/PROJECT_NUMBER/ s|[0-9]\+.[0-9]\+|${NEXT_SHORT_TAG}|g" cpp/doxygen/Doxyfile
sed_runner "/PROJECT_NUMBER[ ]*=/ s|=.*|= ${NEXT_FULL_TAG}|g" cpp/doxygen/Doxyfile

One more update needed here. You can test this with various version numbers to ensure that everything works as intended. For example, run the following and check the diff each time.

bash ci/release/update-version.sh 22.12.00
bash ci/release/update-version.sh 22.12.02

@harrism
Copy link
Member Author

harrism commented Sep 28, 2022

rerun tests

@harrism
Copy link
Member Author

harrism commented Sep 28, 2022

Depends on #667

@harrism harrism added this to the Developer Documentation milestone Sep 29, 2022
rapids-bot bot pushed a commit that referenced this pull request Sep 29, 2022
#700)

This PR fixes some render issue with `library_design.md`, adds links to c++ documentation (maybe changed after merging [673](#673))

Authors:
  - Michael Wang (https://github.com/isVoid)

Approvers:
  - H. Thomson Comer (https://github.com/thomcom)
  - Mark Harris (https://github.com/harrism)

URL: #700
@harrism
Copy link
Member Author

harrism commented Sep 29, 2022

Rerun tests

Copy link
Contributor

@isVoid isVoid left a comment

Choose a reason for hiding this comment

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

Sorry late to the game, all looks good. Using modify_fences.sh to allow proper display in both github and published doxygen certainly is an interesting technique.

cpp/doxygen/developer_guide/DOCUMENTATION.md Show resolved Hide resolved
@isVoid isVoid added 5 - Ready to Merge Testing and reviews complete, ready to merge and removed 5- Merge After Dependencies labels Sep 30, 2022
@isVoid
Copy link
Contributor

isVoid commented Sep 30, 2022

@gpucibot merge

@rapids-bot rapids-bot bot merged commit ba50335 into rapidsai:branch-22.10 Sep 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 - Ready to Merge Testing and reviews complete, ready to merge doc Documentation gpuCI Related to Continuous Integration / Automation libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[DOC] Improve doxygen rendering, grouping, etc.
5 participants