From 932d3b19a2e8b96c1f88a55af37b25aebd56cd1b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 23 Sep 2024 22:45:32 -0500 Subject: [PATCH 1/3] Update fmt (to 11.0.2) and spdlog (to 1.14.1), add those libraries to libcuml conda host dependencies (#6071) Contributes to https://github.com/rapidsai/build-planning/issues/56 * updates `fmt` and `spdlog` to newer versions, to match the rest of RAPIDS * adds `fmt` and `spdlog` to `host:` dependencies for `libcuml` conda packages (see https://github.com/rapidsai/cuml/pull/6071#discussion_r1771772139) Now that most of `conda-forge` has been updated to `fmt >=11.0.1,<12` and `spdlog>=1.14.1,<1.15` (https://github.com/rapidsai/build-planning/issues/56#issuecomment-2334281452), we're attempting to upgrade RAPIDS to similar versions of those libraries. This improves the likelihood that RAPIDS will be installable alongside newer versions of its dependencies and complementary packages on conda-forge. ## Notes for Reviewers This PR is testing changes made in https://github.com/rapidsai/rapids-cmake/pull/689. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cuml/pull/6071 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 ++ conda/environments/all_cuda-125_arch-x86_64.yaml | 2 ++ conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml | 2 ++ conda/environments/cpp_all_cuda-118_arch-x86_64.yaml | 2 ++ conda/environments/cpp_all_cuda-125_arch-x86_64.yaml | 2 ++ conda/recipes/libcuml/conda_build_config.yaml | 6 ++++++ conda/recipes/libcuml/meta.yaml | 2 ++ dependencies.yaml | 2 ++ 8 files changed, 20 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index e7dcb0a323..0540f469d8 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -20,6 +20,7 @@ dependencies: - dask-cudf==24.10.*,>=0.0.0a0 - dask-ml - doxygen=1.9.1 +- fmt>=11.0.2,<12 - gcc_linux-64=11.* - graphviz - hdbscan>=0.8.38,<0.8.39 @@ -69,6 +70,7 @@ dependencies: - scipy>=1.8.0 - seaborn - setuptools +- spdlog>=1.14.1,<1.15 - sphinx-copybutton - sphinx-markdown-tables - sphinx<6 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 2340040085..ad8d12f1a3 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -22,6 +22,7 @@ dependencies: - dask-cudf==24.10.*,>=0.0.0a0 - dask-ml - doxygen=1.9.1 +- fmt>=11.0.2,<12 - gcc_linux-64=11.* - graphviz - hdbscan>=0.8.38,<0.8.39 @@ -65,6 +66,7 @@ dependencies: - scipy>=1.8.0 - seaborn - setuptools +- spdlog>=1.14.1,<1.15 - sphinx-copybutton - sphinx-markdown-tables - sphinx<6 diff --git a/conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml b/conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml index 195ddcd8cd..f332c206d9 100644 --- a/conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml +++ b/conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml @@ -14,6 +14,7 @@ dependencies: - cuda-version=11.8 - cudatoolkit - cxx-compiler +- fmt>=11.0.2,<12 - gcc_linux-64=11.* - libcublas-dev=11.11.3.6 - libcublas=11.11.3.6 @@ -31,6 +32,7 @@ dependencies: - librmm==24.10.*,>=0.0.0a0 - ninja - nvcc_linux-64=11.8 +- spdlog>=1.14.1,<1.15 - sysroot_linux-64==2.17 - tomli name: clang_tidy_cuda-118_arch-x86_64 diff --git a/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml b/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml index 53535e39c4..66291a21ec 100644 --- a/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml @@ -12,6 +12,7 @@ dependencies: - cuda-version=11.8 - cudatoolkit - cxx-compiler +- fmt>=11.0.2,<12 - gcc_linux-64=11.* - libcublas-dev=11.11.3.6 - libcublas=11.11.3.6 @@ -29,5 +30,6 @@ dependencies: - librmm==24.10.*,>=0.0.0a0 - ninja - nvcc_linux-64=11.8 +- spdlog>=1.14.1,<1.15 - sysroot_linux-64==2.17 name: cpp_all_cuda-118_arch-x86_64 diff --git a/conda/environments/cpp_all_cuda-125_arch-x86_64.yaml b/conda/environments/cpp_all_cuda-125_arch-x86_64.yaml index 2973c81db2..90bdefa75e 100644 --- a/conda/environments/cpp_all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/cpp_all_cuda-125_arch-x86_64.yaml @@ -14,6 +14,7 @@ dependencies: - cuda-profiler-api - cuda-version=12.5 - cxx-compiler +- fmt>=11.0.2,<12 - gcc_linux-64=11.* - libcublas-dev - libcufft-dev @@ -25,5 +26,6 @@ dependencies: - libraft==24.10.*,>=0.0.0a0 - librmm==24.10.*,>=0.0.0a0 - ninja +- spdlog>=1.14.1,<1.15 - sysroot_linux-64==2.17 name: cpp_all_cuda-125_arch-x86_64 diff --git a/conda/recipes/libcuml/conda_build_config.yaml b/conda/recipes/libcuml/conda_build_config.yaml index 42b1cf2e86..f802440354 100644 --- a/conda/recipes/libcuml/conda_build_config.yaml +++ b/conda/recipes/libcuml/conda_build_config.yaml @@ -19,6 +19,12 @@ c_stdlib_version: cmake_version: - ">=3.26.4,!=3.30.0" +fmt_version: + - ">=11.0.2,<12" + +spdlog_version: + - ">=1.14.1,<1.15" + treelite_version: - "=4.3.0" diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index 718375b198..0737da6969 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -68,10 +68,12 @@ requirements: - libcusolver-dev - libcusparse-dev {% endif %} + - fmt {{ fmt_version }} - libcumlprims ={{ minor_version }} - libraft ={{ minor_version }} - libraft-headers ={{ minor_version }} - librmm ={{ minor_version }} + - spdlog {{ spdlog_version }} - treelite {{ treelite_version }} outputs: diff --git a/dependencies.yaml b/dependencies.yaml index 23a72d1db8..d176e382ad 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -140,10 +140,12 @@ dependencies: packages: - c-compiler - cxx-compiler + - fmt>=11.0.2,<12 - libcumlprims==24.10.*,>=0.0.0a0 - libraft==24.10.*,>=0.0.0a0 - libraft-headers==24.10.*,>=0.0.0a0 - librmm==24.10.*,>=0.0.0a0 + - spdlog>=1.14.1,<1.15 specific: - output_types: conda matrices: From 9a6db37eb37c8d82ed6609dbde7af3dfe413e612 Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:14:27 -0500 Subject: [PATCH 2/3] Update update-version.sh to use packaging lib (#6081) This PR updates the update-version.sh script to use the packaging library, given that setuptools is no longer included by default in Python 3.12. --- ci/release/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index c953ad0317..e234e1401f 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -24,7 +24,7 @@ NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}') NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR} # Need to distutils-normalize the original version -NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))") +NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))") echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG" From f818527fb2e21b8bceeb01cecbd2ba6f5ce98df1 Mon Sep 17 00:00:00 2001 From: Severin Dicks <37635888+Intron7@users.noreply.github.com> Date: Wed, 25 Sep 2024 01:56:30 +0200 Subject: [PATCH 3/3] add docs for simplicial_set (#6042) fixes #6036 Authors: - Severin Dicks (https://github.com/Intron7) - Divye Gala (https://github.com/divyegala) - Dante Gama Dessavre (https://github.com/dantegd) Approvers: - Victor Lafargue (https://github.com/viclafargue) URL: https://github.com/rapidsai/cuml/pull/6042 --- docs/source/api.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/source/api.rst b/docs/source/api.rst index ea3097d96b..a3a2ab73cc 100644 --- a/docs/source/api.rst +++ b/docs/source/api.rst @@ -506,6 +506,11 @@ UMAP .. autoclass:: cuml.UMAP :members: +.. autofunction:: cuml.manifold.umap.fuzzy_simplicial_set + +.. autofunction:: cuml.manifold.umap.simplicial_set_embedding + + Random Projections ------------------