revert depends_on_numpy

rapidsai · Jan 10, 2025 · 6a83f20 · 6a83f20
1 parent d400dc8
commit 6a83f20
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -18,7 +18,6 @@ files:
       - depends_on_libcudf
       - depends_on_libraft
       - depends_on_librmm
-      - depends_on_numpy
       - depends_on_pylibraft
       - depends_on_pylibwholegraph
       - depends_on_pytorch
@@ -64,12 +63,12 @@ files:
     includes:
       - cuda_version
       - depends_on_cudf
-      - depends_on_numpy
       - depends_on_pylibwholegraph
       - depends_on_pytorch
       - py_version
       - test_python_common
       - test_python_cugraph
+      - test_python_pylibcugraph
   py_build_cugraph:
     output: pyproject
     pyproject_dir: python/cugraph
@@ -100,20 +99,19 @@ files:
       - depends_on_cupy
       - depends_on_dask_cuda
       - depends_on_dask_cudf
-      - depends_on_numpy
       - depends_on_pylibcugraph
       - depends_on_raft_dask
       - depends_on_rmm
       - depends_on_ucx_py
       - python_run_cugraph
+      - test_python_pylibcugraph
   py_test_cugraph:
     output: pyproject
     pyproject_dir: python/cugraph
     extras:
       table: project.optional-dependencies
       key: test
     includes:
-      - depends_on_numpy
       - depends_on_pylibwholegraph
       - test_python_common
       - test_python_cugraph
@@ -144,9 +142,9 @@ files:
     includes:
       - cuda_wheels
       - depends_on_cupy
-      - depends_on_numpy
       - depends_on_pylibraft
       - depends_on_rmm
+      - python_run_pylibcugraph
   py_test_pylibcugraph:
     output: pyproject
     pyproject_dir: python/pylibcugraph
@@ -155,8 +153,8 @@ files:
       key: test
     includes:
       - depends_on_cudf
-      - depends_on_numpy
       - test_python_common
+      - test_python_pylibcugraph
   py_build_cugraph_service_client:
     output: pyproject
     pyproject_dir: python/cugraph-service/client
@@ -178,7 +176,6 @@ files:
     extras:
       table: build-system
     includes:
-      - depends_on_numpy
       - python_build_rapids
       - python_build_wheel
   py_run_cugraph_service_server:
@@ -193,7 +190,6 @@ files:
       - depends_on_cupy
       - depends_on_dask_cuda
       - depends_on_dask_cudf
-      - depends_on_numpy
       - depends_on_rmm
       - depends_on_ucx_py
       - python_run_cugraph_service_server
@@ -205,7 +201,7 @@ files:
       key: test
     includes:
       - test_python_common
-      - test_python_cugraph
+      - test_python_cugraph_service_server
 channels:
   - rapidsai
   - rapidsai-nightly
@@ -404,6 +400,7 @@ dependencies:
         packages:
           - &dask rapids-dask-dependency==25.2.*,>=0.0.0a0
           - &numba numba>=0.57
+          - &numpy numpy>=1.23,<3.0a0
       - output_types: conda
         packages:
           - aiohttp
@@ -426,6 +423,11 @@ dependencies:
           - matrix: # All CUDA 11 versions
             packages:
               - cuda-python>=11.8.5,<12.0a0
+  python_run_pylibcugraph:
+    common:
+      - output_types: [conda, pyproject, requirements]
+        packages:
+          - *numpy
   python_run_cugraph_service_client:
     common:
       - output_types: [conda, pyproject]
@@ -437,6 +439,7 @@ dependencies:
         packages:
           - *dask
           - *numba
+          - *numpy
           - *thrift
   test_cpp:
     common:
@@ -466,11 +469,22 @@ dependencies:
         packages:
           - certifi
           - networkx>=2.5.1
+          - *numpy
           - python-louvain
           - scikit-learn>=0.23.1
       - output_types: [conda]
         packages:
           - *thrift
+  test_python_cugraph_service_server:
+    common:
+      - output_types: [conda, pyproject]
+        packages:
+          - *numpy
+  test_python_pylibcugraph:
+    common:
+      - output_types: [conda, pyproject]
+        packages:
+          - *numpy
 
   depends_on_cugraph:
     common:
@@ -763,12 +777,6 @@ dependencies:
               - cupy-cuda11x>=12.0.0
           - {matrix: null, packages: *cupy_packages_cu11}
 
-  depends_on_numpy:
-    common:
-      - output_types: [conda, pyproject, requirements]
-        packages:
-          - numpy>=1.23,<3.0a0
-
   depends_on_ucx_py:
     common:
       - output_types: conda

diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml
@@ -3,7 +3,6 @@
 [build-system]
 
 requires = [
-    "numpy>=1.23,<3.0a0",
     "rapids-build-backend>=0.3.1,<0.4.0.dev0",
     "setuptools>=61.0.0",
     "wheel",
@@ -47,15 +46,12 @@ cugraph-service-server = "cugraph_service_server.__main__:main"
 
 [project.optional-dependencies]
 test = [
-    "certifi",
-    "networkx>=2.5.1",
+    "numpy>=1.23,<3.0a0",
     "pandas",
     "pytest",
     "pytest-benchmark",
     "pytest-cov",
     "pytest-xdist",
-    "python-louvain",
-    "scikit-learn>=0.23.1",
     "scipy",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.