Merge branch 'branch-24.02' into direct_io_support

rapidsai · Jan 9, 2024 · d58f3e8 · d58f3e8
2 parents 0cf4eab + ef5b3ee
commit d58f3e8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -9,15 +9,15 @@ channels:
 dependencies:
 - breathe
 - c-compiler
-- clang-tools=16.0.0
-- clangxx=16.0.0
+- clang-tools==16.0.6
+- clangxx==16.0.6
 - cmake>=3.26.4
 - cuda-nvtx=11.8
 - cudatoolkit=11.8
-- cudnn=8.4
+- cudnn=8.8
 - cxx-compiler
-- cython
-- doxygen=1.8.20
+- cython>=3.0.0
+- doxygen==1.9.1
 - gcc_linux-64=11.*
 - gitpython
 - graphviz

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -9,17 +9,17 @@ channels:
 dependencies:
 - breathe
 - c-compiler
-- clang-tools=16.0.0
-- clangxx=16.0.0
+- clang-tools==16.0.6
+- clangxx==16.0.6
 - cmake>=3.26.4
 - cuda-cudart-dev
 - cuda-nvcc
 - cuda-nvtx
 - cuda-version=12.0
-- cudnn=8.4
+- cudnn=8.8
 - cxx-compiler
-- cython
-- doxygen=1.8.20
+- cython>=3.0.0
+- doxygen==1.9.1
 - gcc_linux-64=11.*
 - gitpython
 - graphviz

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -68,10 +68,10 @@ dependencies:
         packages:
           - c-compiler
           - cmake>=3.26.4
-          - cudnn=8.4
+          - cudnn=8.8
           - cxx-compiler
-          - cython
-          - doxygen=1.8.20
+          - cython>=3.0.0
+          - &doxygen doxygen==1.9.1
           - libraft-headers==24.2.*
           - librmm==24.2.*
           - nanobind>=0.2.0
@@ -252,7 +252,7 @@ dependencies:
       - output_types: [conda, requirements]
         packages:
           - breathe
-          - doxygen=1.8.20
+          - *doxygen
           - graphviz
           - ipython
           - ipykernel
@@ -274,15 +274,15 @@ dependencies:
     common:
       - output_types: [conda, requirements]
         packages:
-          - clangxx=16.0.0
-          - clang-tools=16.0.0
+          - clangxx==16.0.6
+          - clang-tools==16.0.6
           - gitpython
   python_build_wheel:
     common:
       - output_types: [pyproject]
         packages:
           - cmake>=3.26.4
-          - cython>=0.29,<0.30
+          - cython>=3.0.0
           - ninja
           - setuptools
           - scikit-build>=0.13.1

diff --git a/python/pylibwholegraph/CMakeLists.txt b/python/pylibwholegraph/CMakeLists.txt
@@ -113,7 +113,9 @@ include(../../cpp/cmake/thirdparty/get_raft.cmake)
 #include(${CMAKE_CURRENT_LIST_DIR}/../cmake/thirdparty/nanobind.cmake)
 
 # use <package>_ROOT here to take precedence over any other package
-set(wholegraph_ROOT "$ENV{LIBWHOLEGRAPH_DIR}")
+if (DEFINED ENV{LIBWHOLEGRAPH_DIR})
+  set(wholegraph_ROOT "$ENV{LIBWHOLEGRAPH_DIR}")
+endif()
 find_package(wholegraph "${RAPIDS_VERSION}.0" EXACT)
 message("WholeGraph")
 if (WHOLEGRAPH_FOUND)

diff --git a/python/pylibwholegraph/pyproject.toml b/python/pylibwholegraph/pyproject.toml
@@ -15,7 +15,7 @@
 [build-system]
 requires = [
     "cmake>=3.26.4",
-    "cython>=0.29,<0.30",
+    "cython>=3.0.0",
     "ninja",
     "scikit-build>=0.13.1",
     "setuptools",