Merge branch 'branch-25.02' into feat/raft_logger

rapidsai · Dec 30, 2024 · 72b9cbe · 72b9cbe
2 parents 5d3481c + 53afaba
commit 72b9cbe
Show file tree

Hide file tree

Showing 7 changed files with 138 additions and 90 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -58,7 +58,6 @@ DEPENDENCIES=(
   dask-cudf
   libcudf
   libraft
-  libraft-headers
   librmm
   pylibcugraph
   pylibwholegraph

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -8,7 +8,6 @@ channels:
 - nvidia
 dependencies:
 - aiohttp
-- breathe
 - c-compiler
 - certifi
 - cmake>=3.26.4,!=3.30.0
@@ -28,7 +27,6 @@ dependencies:
 - graphviz
 - ipython
 - libcudf==25.2.*,>=0.0.0a0
-- libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
 - nbsphinx
@@ -64,15 +62,16 @@ dependencies:
 - scikit-learn>=0.23.1
 - scipy
 - setuptools>=61.0.0
+- sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables
-- sphinx<6
 - sphinxcontrib-websupport
-- thriftpy2!=0.5.0,!=0.5.1
+- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
 - torchdata
 - torchmetrics
 - ucx-proc=*=gpu
 - ucx-py==0.42.*,>=0.0.0a0
-- wget
 - wheel
+- pip:
+  - breathe>=4.35.0
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -8,7 +8,6 @@ channels:
 - nvidia
 dependencies:
 - aiohttp
-- breathe
 - c-compiler
 - certifi
 - cmake>=3.26.4,!=3.30.0
@@ -34,7 +33,6 @@ dependencies:
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
-- libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
 - nbsphinx
@@ -69,15 +67,16 @@ dependencies:
 - scikit-learn>=0.23.1
 - scipy
 - setuptools>=61.0.0
+- sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables
-- sphinx<6
 - sphinxcontrib-websupport
-- thriftpy2!=0.5.0,!=0.5.1
+- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
 - torchdata
 - torchmetrics
 - ucx-proc=*=gpu
 - ucx-py==0.42.*,>=0.0.0a0
-- wget
 - wheel
+- pip:
+  - breathe>=4.35.0
 name: all_cuda-125_arch-x86_64
diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
@@ -70,7 +70,6 @@ requirements:
     - doxygen {{ doxygen_version }}
     - libcudf ={{ minor_version }}
     - libraft ={{ minor_version }}
-    - libraft-headers ={{ minor_version }}
     - librmm ={{ minor_version }}
     - nccl {{ nccl_version }}
     - ucx-proc=*=gpu
@@ -114,7 +113,6 @@ outputs:
         - libcusparse
        {% endif %}
         - libraft ={{ minor_version }}
-        - libraft-headers ={{ minor_version }}
         - librmm ={{ minor_version }}
         - nccl {{ nccl_version }}
         - ucx-proc=*=gpu