Remove NumPy <2 pin, remove proj pin

.github/workflows/pr.yaml

@@ -12,46 +12,46 @@ concurrency:
 jobs:
   pr-builder:
     needs:
-      - checks
+      # - checks
       - conda-cpp-build
-      - conda-cpp-checks
-      - conda-cpp-tests
+      # - conda-cpp-checks
+      # - conda-cpp-tests
       - conda-python-build
       - conda-python-tests
       - conda-notebook-tests
-      - docs-build
+      # - docs-build
       - wheel-build-cuspatial
       - wheel-build-libcuspatial
-      - wheel-tests-cuspatial
+      # - wheel-tests-cuspatial
       - wheel-build-cuproj
-      - wheel-tests-cuproj
+      # - wheel-tests-cuproj
       - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-  checks:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      enable_check_generated_files: false
+  # checks:
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+  #   with:
+  #     enable_check_generated_files: false
   conda-cpp-build:
-    needs: checks
+    # needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
       build_type: pull-request
-  conda-cpp-checks:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
-      enable_check_symbols: true
-  conda-cpp-tests:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
+  # conda-cpp-checks:
+  #   needs: conda-cpp-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+  #   with:
+  #     build_type: pull-request
+  #     enable_check_symbols: true
+  # conda-cpp-tests:
+  #   needs: conda-cpp-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+  #   with:
+  #     build_type: pull-request
   conda-python-build:
     needs: conda-cpp-build
     secrets: inherit
@@ -74,18 +74,18 @@ jobs:
       arch: "amd64"
       container_image: "rapidsai/ci-conda:latest"
       run_script: "ci/test_notebooks.sh"
-  docs-build:
-    needs: conda-python-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/build_docs.sh"
+  # docs-build:
+  #   needs: conda-python-build
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+  #   with:
+  #     build_type: pull-request
+  #     node_type: "gpu-v100-latest-1"
+  #     arch: "amd64"
+  #     container_image: "rapidsai/ci-conda:latest"
+  #     run_script: "ci/build_docs.sh"
   wheel-build-libcuspatial:
-    needs: checks
+    # needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
@@ -94,33 +94,33 @@ jobs:
       build_type: pull-request
       script: ci/build_wheel_libcuspatial.sh
   wheel-build-cuspatial:
-    needs: [checks, wheel-build-libcuspatial]
+    needs: [wheel-build-libcuspatial]
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
       build_type: pull-request
       script: ci/build_wheel_cuspatial.sh
-  wheel-tests-cuspatial:
-    needs: wheel-build-cuspatial
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuspatial.sh
+  # wheel-tests-cuspatial:
+  #   needs: wheel-build-cuspatial
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+  #   with:
+  #     build_type: pull-request
+  #     script: ci/test_wheel_cuspatial.sh
   wheel-build-cuproj:
-    needs: checks
+    # needs: checks
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
       build_type: pull-request
       script: ci/build_wheel_cuproj.sh
-  wheel-tests-cuproj:
-    needs: [wheel-build-cuspatial, wheel-build-cuproj]
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cuproj.sh
+  # wheel-tests-cuproj:
+  #   needs: [wheel-build-cuspatial, wheel-build-cuproj]
+  #   secrets: inherit
+  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+  #   with:
+  #     build_type: pull-request
+  #     script: ci/test_wheel_cuproj.sh
   devcontainer:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]

ci/build_cpp.sh

@@ -11,6 +11,9 @@ source rapids-date-string
 
 export CMAKE_GENERATOR=Ninja
 
+cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
+source ./ci/use_conda_packages_from_prs.sh
+
 rapids-print-env
 
 rapids-logger "Begin cpp build"

ci/build_python.sh

@@ -11,6 +11,9 @@ source rapids-date-string
 
 export CMAKE_GENERATOR=Ninja
 
+cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
+source ./ci/use_conda_packages_from_prs.sh
+
 rapids-print-env
 
 package_dir="python"

ci/build_wheel.sh

@@ -29,6 +29,8 @@ esac
 source rapids-configure-sccache
 source rapids-date-string
 
+source ./ci/use_wheels_from_prs.sh
+
 rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"

ci/build_wheel_cuproj.sh

@@ -3,4 +3,6 @@
 
 set -euo pipefail
 
+source ./ci/use_wheels_from_prs.sh
+
 ci/build_wheel.sh cuproj python/cuproj python

ci/build_wheel_cuspatial.sh

@@ -5,13 +5,15 @@ set -euo pipefail
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
+source ./ci/use_wheels_from_prs.sh
+
 # Downloads libcuspatial wheel from this current build,
 # then ensures 'cuspatial' wheel builds always use the 'libcuspatial' just built in the same CI run.
 #
 # Using env variable PIP_CONSTRAINT is necessary to ensure the constraints
 # are used when creating the isolated build environment.
 RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcuspatial_dist
-echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" > /tmp/constraints.txt
+echo "libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libcuspatial_dist/libcuspatial_*.whl)" >> /tmp/constraints.txt
 export PIP_CONSTRAINT="/tmp/constraints.txt"
 
 ci/build_wheel.sh cuspatial python/cuspatial python

ci/build_wheel_libcuspatial.sh

@@ -3,4 +3,6 @@
 
 set -euo pipefail
 
+source ./ci/use_wheels_from_prs.sh
+
 ci/build_wheel.sh libcuspatial python/libcuspatial cpp

ci/test_cpp.sh

@@ -4,7 +4,7 @@
 set -euo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
-
+source "$(dirname "$0")/use_conda_packages_from_prs.sh"
 
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

ci/test_notebooks.sh

@@ -5,6 +5,8 @@ set -eEuo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
 
+source "$(dirname "$0")/use_conda_packages_from_prs.sh"
+
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)

ci/test_python.sh

@@ -4,6 +4,7 @@
 set -euo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
+source "$(dirname "$0")/use_conda_packages_from_prs.sh"
 
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

ci/test_wheel_cuproj.sh

@@ -6,6 +6,8 @@ set -eou pipefail
 mkdir -p ./dist
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
+source ./ci/use_wheels_from_prs.sh
+
 # Download the cuproj and cuspatial built in the previous step
 RAPIDS_PY_WHEEL_NAME="cuproj_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist
 RAPIDS_PY_WHEEL_NAME="cuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist

ci/test_wheel_cuspatial.sh

@@ -6,6 +6,8 @@ set -eou pipefail
 mkdir -p ./dist
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
+source ./ci/use_wheels_from_prs.sh
+
 # Download the cuspatial and libcuspatial built in the previous step
 RAPIDS_PY_WHEEL_NAME="cuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist
 RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp ./dist

ci/use_conda_packages_from_prs.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python)
+
+CUDF_CPP_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 cpp)
+CUDF_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 python)
+
+# UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp)
+
+conda config --system --add channels "${LIBRMM_CHANNEL}"
+conda config --system --add channels "${RMM_CHANNEL}"
+conda config --system --add channels "${CUDF_CPP_CHANNEL}"
+conda config --system --add channels "${CUDF_PYTHON_CHANNEL}"
+# conda config --system --add channels "${UCXX_CHANNEL}"

ci/use_wheels_from_prs.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
+
+LIBRMM_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 cpp
+)
+RMM_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python
+)
+
+# UCXX_CHANNEL=$(
+#   RAPIDS_PY_WHEEL_NAME=ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python
+# )
+# LIBUCXX_CHANNEL=$(
+#   RAPIDS_PY_WHEEL_NAME=libucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 cpp
+# )
+# DISTRIBUTED_UCXX_CHANNEL=$(
+#   RAPIDS_PY_WHEEL_NAME=distributed_ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python
+# )
+
+CUDF_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME=cudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python
+)
+LIBCUDF_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME=libcudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 cpp
+)
+PYLIBCUDF_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME=pylibcudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python
+)
+DASK_CUDF_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME=dask_cudf_${RAPIDS_PY_CUDA_SUFFIX} \
+  RAPIDS_PY_WHEEL_PURE=1 \
+    rapids-get-pr-wheel-artifact cudf 16806 python
+)
+
+# RAFT_DASK_CHANNEL=$(
+#   RAPIDS_PY_WHEEL_NAME=raft_dask_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python
+# )
+# PYLIBRAFT_CHANNEL=$(
+#   RAPIDS_PY_WHEEL_NAME=pylibraft_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python
+# )
+
+cat > /tmp/constraints.txt <<EOF
+librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRMM_CHANNEL}/librmm_*.whl)
+rmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RMM_CHANNEL}/rmm_*.whl)
+cudf-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${CUDF_CHANNEL}/cudf_*.whl)
+libcudf-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUDF_CHANNEL}/libcudf_*.whl)
+pylibcudf-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${PYLIBCUDF_CHANNEL}/pylibcudf_*.whl)
+dask-cudf-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${DASK_CUDF_CHANNEL}/dask_cudf_*.whl)
+EOF
+
+# ucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${UCXX_CHANNEL}/ucxx_*.whl)
+# libucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBUCXX_CHANNEL}/libucxx_*.whl)
+# distributed-ucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${DISTRIBUTED_UCXX_CHANNEL}/distributed_ucxx_*.whl)
+# raft-dask-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RAFT_DASK_CHANNEL}/raft_dask_*.whl)
+# pylibraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${PYLIBRAFT_CHANNEL}/pylibraft_*.whl)
+export PIP_CONSTRAINT=/tmp/constraints.txt

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

@@ -28,12 +28,12 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numpy>=1.23,<2.0a0
+- numpy>=1.23,<3.0a0
 - numpydoc
 - nvcc_linux-64=11.8
 - osmnx>=1.9.3
 - pre-commit
-- proj >=9.3.0,<9.3.1.0a0
+- proj
 - pydata-sphinx-theme!=0.14.2
 - pydeck
 - pylibcudf==24.10.*,>=0.0.0a0

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

@@ -31,11 +31,11 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numpy>=1.23,<2.0a0
+- numpy>=1.23,<3.0a0
 - numpydoc
 - osmnx>=1.9.3
 - pre-commit
-- proj >=9.3.0,<9.3.1.0a0
+- proj
 - pydata-sphinx-theme!=0.14.2
 - pydeck
 - pylibcudf==24.10.*,>=0.0.0a0

conda/recipes/cuproj/meta.yaml

@@ -64,7 +64,7 @@ requirements:
     - rapids-build-backend >=0.3.0,<0.4.0.dev0
     - librmm ={{ minor_version }}
     - scikit-build-core >=0.10.0
-    - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+    - proj
     - sqlite
   run:
     {% if cuda_major == "11" %}

conda/recipes/cuspatial/meta.yaml

@@ -77,7 +77,7 @@ requirements:
     - cudf ={{ minor_version }}
     - pylibcudf ={{ minor_version }}
     - geopandas >=1.0.0
-    - numpy >=1.23,<2.0a0
+    - numpy  >=1.23,<3.0a0
     - python
     - rmm ={{ minor_version }}
 

conda/recipes/libcuspatial/meta.yaml

@@ -49,7 +49,7 @@ requirements:
     - libcudf ={{ minor_version }}
     - librmm ={{ minor_version }}
     - sqlite
-    - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+    - proj
 
 outputs:
   - name: libcuspatial
@@ -85,7 +85,7 @@ outputs:
         - libcudf ={{ minor_version }}
         - librmm ={{ minor_version }}
         - sqlite
-        - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+        - proj
     test:
       commands:
         - test -f $PREFIX/lib/libcuspatial.so