Merge remote-tracking branch 'upstream/branch-24.04' into ref/full

rapidsai · Mar 5, 2024 · 3dd214e · 3dd214e
2 parents e18caa1 + 54f0430
commit 3dd214e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -119,13 +119,13 @@ docker run --gpus all --pull always --rm -it \
 ### Install with Conda
 
 To install via conda:
-> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9 and 3.10
+> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9, 3.10, and 3.11.
 
 cuSpatial can be installed with conda (miniconda, or the full Anaconda distribution) from the rapidsai channel:
 
 ```shell
 conda install -c rapidsai -c conda-forge -c nvidia \
-    cuspatial=24.04 python=3.10 cudatoolkit=11.8
+    cuspatial=24.04 python=3.11 cudatoolkit=11.8
 ```
 We also provide nightly Conda packages built from the HEAD of our latest development branch.
 
@@ -134,7 +134,7 @@ See the [RAPIDS installation documentation](https://docs.rapids.ai/install) for
 ### Install with pip
 
 To install via pip:
-> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9 and 3.10
+> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9, 3.10, and 3.11.
 
 The cuSpatial pip packages can be installed from NVIDIA's PyPI index. pip installations require using the matching wheel to the system's installed CUDA toolkit.
 - For CUDA 11 toolkits, install the `-cu11` wheels

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -30,6 +30,7 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
+- numpy>=1.23
 - numpydoc
 - nvcc_linux-64=11.8
 - pre-commit
@@ -39,7 +40,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-xdist
-- python>=3.9,<3.11
+- python>=3.9,<3.12
 - rmm==24.4.*
 - scikit-build-core>=0.7.0
 - scikit-image

diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -33,6 +33,7 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
+- numpy>=1.23
 - numpydoc
 - pre-commit
 - proj
@@ -41,7 +42,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-xdist
-- python>=3.9,<3.11
+- python>=3.9,<3.12
 - rmm==24.4.*
 - scikit-build-core>=0.7.0
 - scikit-image

diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml
@@ -75,6 +75,7 @@ requirements:
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     - cudf ={{ minor_version }}
     - geopandas >=0.11.0
+    - numpy >=1.23
     - python
     - rmm ={{ minor_version }}
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -324,13 +324,18 @@ dependencies:
             packages:
               - python=3.10
           - matrix:
+              py: "3.11"
             packages:
-              - python>=3.9,<3.11
+              - python=3.11
+          - matrix:
+            packages:
+              - python>=3.9,<3.12
   run_python_cuspatial:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
           - geopandas>=0.11.0
+          - &numpy numpy>=1.23
   test_python_cuspatial:
     common:
       - output_types: [conda, requirements, pyproject]
@@ -342,6 +347,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
+          - *numpy
           - pytest
           - pytest-cov
           - pytest-xdist

diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml
@@ -44,12 +44,14 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 
 [project.optional-dependencies]
 test = [
     "cuspatial==24.4.*",
     "geopandas>=0.11.0",
+    "numpy>=1.23",
     "pyproj>=3.6.0,<3.7a0",
     "pytest",
     "pytest-cov",

diff --git a/python/cuspatial/cuspatial/tests/test_geodataframe.py b/python/cuspatial/cuspatial/tests/test_geodataframe.py
@@ -320,6 +320,10 @@ def test_boolmask(gpdf, df_boolmask):
     assert_eq_geo_df(gi[df_boolmask], cugpdf_back[df_boolmask])
 
 
+@pytest.mark.xfail(
+    reason="Size discrepancies between Python versions. See "
+    "https://github.com/rapidsai/cuspatial/issues/1352"
+)
 def test_memory_usage(gs):
     assert gs.memory_usage() == 224
     host_dataframe = gpd.read_file(

diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml
@@ -38,6 +38,7 @@ requires-python = ">=3.9"
 dependencies = [
     "cudf==24.4.*",
     "geopandas>=0.11.0",
+    "numpy>=1.23",
     "rmm==24.4.*",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
@@ -48,6 +49,7 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 
 [project.optional-dependencies]