Skip to content

Commit 3bbc087

Browse files
authored
Refresh requirements (#3622)
* Allow NumPy 1.24 (soften upper bounds) * Require NumPy 1.21+ consistently * Require Numba 0.57+ consistently * Add Python requirement where it was missed * Drop deprecated `x.x` notation with Python Authors: - https://github.com/jakirkham - Rick Ratzel (https://github.com/rlratzel) Approvers: - Rick Ratzel (https://github.com/rlratzel) - Ray Douglass (https://github.com/raydouglass) URL: #3622
1 parent c49643c commit 3bbc087

File tree

13 files changed

+28
-22
lines changed

13 files changed

+28
-22
lines changed

ci/test_python.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@ pushd python/cugraph/cugraph
6767
export DASK_WORKER_DEVICES="0"
6868
pytest \
6969
-v \
70+
--benchmark-disable \
7071
--cache-clear \
7172
--junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph.xml" \
7273
--cov-config=../../.coveragerc \
7374
--cov=cugraph \
7475
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
7576
--cov-report=term \
77+
-k "not test_property_graph_mg" \
7678
tests
7779
popd
7880

conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies:
3838
- ninja
3939
- notebook>=0.5.0
4040
- numba>=0.57
41-
- numpy>=1.21,<1.24
41+
- numpy>=1.21
4242
- numpydoc
4343
- nvcc_linux-64=11.8
4444
- openmpi

conda/recipes/cugraph-dgl/meta.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ build:
2020

2121
requirements:
2222
host:
23-
- python x.x
23+
- python
2424
run:
2525
- cugraph ={{ version }}
2626
- dgl >=1.1.0.cu*
2727
- numba >=0.57
28-
- numpy
29-
- python x.x
28+
- numpy >=1.21
29+
- python
3030
- pytorch
3131

3232
tests:

conda/recipes/cugraph-pyg/meta.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ requirements:
2323
- sysroot_{{ target_platform }} {{ sysroot_version }}
2424
host:
2525
- cython >=0.29,<0.30
26-
- python x.x
26+
- python
2727
- scikit-build >=0.13.1
2828
run:
2929
- distributed ==2023.3.2.1
3030
- numba >=0.57
31-
- numpy
31+
- numpy >=1.21
32+
- python
3233
- pytorch >=2.0
3334
- cupy >=12.0.0
3435
- cugraph ={{ version }}

conda/recipes/cugraph-service/meta.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ outputs:
2727
requirements:
2828
host:
2929
- pip
30-
- python x.x
30+
- python
3131
run:
32-
- python x.x
32+
- python
3333
- thriftpy2 >=0.4.15
3434

3535
- name: cugraph-service-server
@@ -47,7 +47,7 @@ outputs:
4747
requirements:
4848
host:
4949
- pip
50-
- python x.x
50+
- python
5151
- setuptools
5252
- wheel
5353
run:
@@ -58,8 +58,9 @@ outputs:
5858
- dask-cuda ={{ minor_version }}
5959
- dask-cudf ={{ minor_version }}
6060
- distributed ==2023.3.2.1
61-
- numpy
62-
- python x.x
61+
- numba >=0.57
62+
- numpy >=1.21
63+
- python
6364
- thriftpy2 >=0.4.15
6465
- ucx-py {{ ucx_py_version }}
6566

conda/recipes/cugraph/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ requirements:
6060
- libraft ={{ minor_version }}
6161
- libraft-headers ={{ minor_version }}
6262
- pylibraft ={{ minor_version}}
63-
- python x.x
63+
- python
6464
- raft-dask ={{ minor_version }}
6565
- scikit-build >=0.13.1
6666
- setuptools
@@ -81,7 +81,7 @@ requirements:
8181
- libraft-headers ={{ minor_version }}
8282
- pylibcugraph ={{ version }}
8383
- pylibraft ={{ minor_version }}
84-
- python x.x
84+
- python
8585
- raft-dask ={{ minor_version }}
8686
- ucx-proc=*=gpu
8787
- ucx-py {{ ucx_py_version }}

conda/recipes/pylibcugraph/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ requirements:
6060
- libraft ={{ minor_version }}
6161
- libraft-headers ={{ minor_version }}
6262
- pylibraft ={{ minor_version}}
63-
- python x.x
63+
- python
6464
- rmm ={{ minor_version }}
6565
- scikit-build >=0.13.1
6666
- setuptools
@@ -69,7 +69,7 @@ requirements:
6969
run:
7070
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
7171
- libcugraph ={{ version }}
72-
- python x.x
72+
- python
7373

7474
tests:
7575
requirements:

dependencies.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ dependencies:
329329
- output_types: [conda, pyproject]
330330
packages:
331331
- *numba
332-
- &numpy numpy>=1.21,<1.24 # Temporarily upper bound numpy to avoid overflow deprecations
332+
- &numpy numpy>=1.21
333333
- output_types: [pyproject]
334334
packages:
335335
- &cugraph cugraph==23.6.*
@@ -356,6 +356,7 @@ dependencies:
356356
- *dask_cuda
357357
- *dask_cudf
358358
- *distributed
359+
- *numba
359360
- *numpy
360361
- *rmm
361362
- *thrift

python/cugraph-dgl/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ requires-python = ">=3.9"
2121
dependencies = [
2222
"cugraph==23.6.*",
2323
"numba>=0.57",
24-
"numpy>=1.21,<1.24",
24+
"numpy>=1.21",
2525
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
2626
classifiers = [
2727
"Intended Audience :: Developers",

python/cugraph-pyg/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
dependencies = [
2929
"cugraph==23.6.*",
3030
"numba>=0.57",
31-
"numpy>=1.21,<1.24",
31+
"numpy>=1.21",
3232
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
3333

3434
[project.urls]

0 commit comments

Comments
 (0)