Merge branch 'branch-24.10' into fix-remove-old-dask-logreg

rapidsai · Sep 25, 2024 · 4491eff · 4491eff
2 parents 124506f + f818527
commit 4491eff
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 3 deletions.
diff --git 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"
 

diff --git 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
@@ -67,6 +68,8 @@ dependencies:
 - scikit-learn==1.5
 - 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
@@ -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
@@ -63,6 +64,8 @@ dependencies:
 - scikit-learn==1.5
 - 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git 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
 ------------------
 

diff --git a/python/cuml/cuml/fil/fil.pyx b/python/cuml/cuml/fil/fil.pyx
@@ -26,7 +26,7 @@ rmm = gpu_only_import('rmm')
 
 from libcpp cimport bool
 from libc.stdint cimport uintptr_t
-from libc.stdlib cimport free
+from libc.stdlib cimport free as c_free
 
 import cuml.internals
 from cuml.internals.array import CumlArray
@@ -545,7 +545,7 @@ cdef class ForestInference_impl():
         treelite_params.threads_per_tree = kwargs['threads_per_tree']
         if kwargs['compute_shape_str']:
             if self.shape_str:
-                free(self.shape_str)
+                c_free(self.shape_str)
             treelite_params.pforest_shape_str = &self.shape_str
         else:
             treelite_params.pforest_shape_str = NULL