Refactoring into 23.08

[BradReesWork]

This branch is a collection of all the refactoring improvements.

closes #13
closes #14
closes #17
closes #18
closes https://github.com/rapidsai/cugraph-ops/issues/492

[ajschmidt8]

left a few comments.

additionally, this repository will also need an update-version.sh script to ensure all of the RAPIDS version numbers stay up-to-date.

see the cugraph file below for reference:

• https://github.com/rapidsai/cudf/blob/branch-23.08/ci/release/update-version.sh

[ajschmidt8]

Looks good. In addition the the PR comments, I have one other question/request.

Are all of the Doxygen files needed? I see three right now:

• cpp/Doxyfile.in
• cpp/Doxyfile
• cpp/doxygen/Doxyfile

If not, can you remove the extra ones?

Also, in other repositories, we've intentionally removed CMake as a dependency for building Doxygen docs (see here: rapidsai/cuml#5155).

Can you also do that for this repository? If cpp/Doxyfile.in isn't used, then you'll just need to delete that file to complete this request. That's the only Doxygen file that I see which still uses CMake, though I don't see that file being used anywhere.

[dongxuy04]

Looks good. In addition the the PR comments, I have one other question/request.

Are all of the Doxygen files needed? I see three right now:

• cpp/Doxyfile.in
• cpp/Doxyfile
• cpp/doxygen/Doxyfile

If not, can you remove the extra ones?

Also, in other repositories, we've intentionally removed CMake as a dependency for building Doxygen docs (see here: rapidsai/cuml#5155).

Can you also do that for this repository? If cpp/Doxyfile.in isn't used, then you'll just need to delete that file to complete this request. That's the only Doxygen file that I see which still uses CMake, though I don't see that file being used anywhere.

Thanks for helping figure this out, removed cpp/Doxyfile.in and cpp/doxygen/Doxyfile, only cpp/Doxyfile left now.

[ajschmidt8]

I have one more round of suggestions. I had to play with some of this locally, so it's easier for me to just post the patch below and elaborate on the changes.

Details

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index ae90826..eb0720b 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -46,10 +46,10 @@ sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cma
 sed_runner 's/'"RAPIDS_VERSION \".*\")"'/'"RAPIDS_VERSION \"${NEXT_SHORT_TAG}\")"'/g' cpp/CMakeLists.txt
 
 # Python CMakeLists updates
-sed_runner 's/'"RAPIDS_VERSION .*)"'/'"RAPIDS_VERSION ${NEXT_FULL_TAG})"'/g' python/pylibwholegraph/CMakeLists.txt
+sed_runner '/set(RAPIDS_VERSION/ s/".*"/'\"${NEXT_SHORT_TAG}\"'/g' python/pylibwholegraph/CMakeLists.txt
 
 # Python setup.py updates
-sed_runner 's/'version=".*"'/'version="${NEXT_FULL_TAG}"'/g' python/pylibwholegraph/setup.py
+sed_runner 's/'version=\".*\"'/'version=\"${NEXT_FULL_TAG}\"'/g' python/pylibwholegraph/setup.py
 
 
 # RTD update
@@ -85,7 +85,7 @@ for DEP in "${DEPENDENCIES[@]}"; do
 done
 
 # Doxyfile update
-sed_runner "s|PROJECT_NUMBER[[:space:]]*=.*|PROJECT_NUMBER=${NEXT_SHORT_TAG}|" cpp/Doxyfile
+sed_runner "/^PROJECT_NUMBER/ s|=.*|= ${NEXT_SHORT_TAG}|" cpp/Doxyfile
 
 
 # CI files
diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml
index bbadcc0..f163b45 100644
--- a/conda/environments/all_cuda-115_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-115_arch-x86_64.yaml
@@ -23,8 +23,8 @@ dependencies:
 - graphviz
 - ipykernel
 - ipython
-- libraft-headers==23.08.*
-- librmm==23.08.*
+- libraft-headers==23.8.*
+- librmm==23.8.*
 - nanobind>=0.2.0
 - nbsphinx
 - nccl
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 70e3721..ec637bb 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -23,8 +23,8 @@ dependencies:
 - graphviz
 - ipykernel
 - ipython
-- libraft-headers==23.08.*
-- librmm==23.08.*
+- libraft-headers==23.8.*
+- librmm==23.8.*
 - nanobind>=0.2.0
 - nbsphinx
 - nccl
diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
index b354691..b532944 100644
--- a/conda/environments/all_cuda-120_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -25,8 +25,8 @@ dependencies:
 - graphviz
 - ipykernel
 - ipython
-- libraft-headers==23.08.*
-- librmm==23.08.*
+- libraft-headers==23.8.*
+- librmm==23.8.*
 - nanobind>=0.2.0
 - nbsphinx
 - nccl
diff --git a/dependencies.yaml b/dependencies.yaml
index 280aae0..2eb6d63 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -164,8 +164,8 @@ dependencies:
     common:
       - output_types: [conda, requirements]
         packages:
-          - libraft-headers==23.08.*
-          - librmm==23.08.*
+          - libraft-headers==23.8.*
+          - librmm==23.8.*
   test_cpp:
     common:
       - output_types: [conda, requirements]

The changes are as follows:

• update-version.sh:
  • some of the suggestions here just fix some quotes that weren't working correctly
  • other suggestions make use of sed addresses to fix and simplify the search and replace suggestions. sed addresses work by specifying a range of line(s) that the subsequent search and replace expression should be run on. so sed /^THE_LINE/ s/E/S/ would only run the s/E/S operation on lines that start with THE_LINE
• version specifiers - I've updated the version specifiers in both dependencies.yaml and the environment files it generates to follow PEP 440 standards. though it's not formally recorded anywhere, this is the convention we've adopted for other repos (like cudf here) so that our version specifiers can be compatible with both conda and pip.

The result of the update-version.sh changes is that you can run the following sequence of commands and the net result will be no changes, which is the ideal behavior:

bash ci/release/update-version.sh 23.08.00
bash ci/release/update-version.sh 23.10.00
bash ci/release/update-version.sh 24.08.00
bash ci/release/update-version.sh 23.08.00 # back to `23.08.00`. no net changes

[tingyu66]

Conda recipes and wheel building script LGTM.

[tingyu66]

I have one more round of suggestions. I had to play with some of this locally, so it's easier for me to just post the patch below and elaborate on the changes.

Details
The changes are as follows:

• update-version.sh:

  • some of the suggestions here just fix some quotes that weren't working correctly
  • other suggestions make use of sed addresses to fix and simplify the search and replace suggestions. sed addresses work by specifying a range of line(s) that the subsequent search and replace expression should be run on. so sed /^THE_LINE/ s/E/S/ would only run the s/E/S operation on lines that start with THE_LINE

• version specifiers - I've updated the version specifiers in both dependencies.yaml and the environment files it generates to follow PEP 440 standards. though it's not formally recorded anywhere, this is the convention we've adopted for other repos (like cudf here) so that our version specifiers can be compatible with both conda and pip.

The result of the update-version.sh changes is that you can run the following sequence of commands and the net result will be no changes, which is the ideal behavior:

bash ci/release/update-version.sh 23.08.00
bash ci/release/update-version.sh 23.10.00
bash ci/release/update-version.sh 24.08.00
bash ci/release/update-version.sh 23.08.00 # back to `23.08.00`. no net changes

Thanks for the suggestions. They should be addressed in #44. Please take a look over there since I cannot request your review due to priviledges.

[dongxuy04]

LGTM, thanks!

[ajschmidt8]

looks good. two small comments left.

[ajschmidt8]

/merge