Skip to content

Commit 0da4274

Browse files
raydouglassraydouglass
committed
Merge pull request #1391 from rapidsai/branch-24.06
2 parents 7da37aa + 5a0c039 commit 0da4274

File tree

133 files changed

+914
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+914
-645
lines changed

‎.devcontainer/cuda11.8-conda/devcontainer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.06-cpp-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
11+
"runArgs": [
12+
"--rm",
13+
"--name",
14+
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda11.8-conda"
15+
],
1116
"hostRequirements": {"gpu": "optional"},
1217
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.4": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {}
1419
},
1520
"overrideFeatureInstallOrder": [
1621
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda11.8-pip/devcontainer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.04-cpp-cuda11.8-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.06-cpp-cuda11.8-ubuntu22.04"
99
}
1010
},
11+
"runArgs": [
12+
"--rm",
13+
"--name",
14+
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda11.8-pip"
15+
],
1116
"hostRequirements": {"gpu": "optional"},
1217
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.4": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {}
1419
},
1520
"overrideFeatureInstallOrder": [
1621
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.2-conda/devcontainer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
"args": {
66
"CUDA": "12.2",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:24.04-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.06-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
11+
"runArgs": [
12+
"--rm",
13+
"--name",
14+
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda12.2-conda"
15+
],
1116
"hostRequirements": {"gpu": "optional"},
1217
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.4": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {}
1419
},
1520
"overrideFeatureInstallOrder": [
1621
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.2-pip/devcontainer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
"args": {
66
"CUDA": "12.2",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.04-cpp-cuda12.2-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.06-cpp-cuda12.2-ubuntu22.04"
99
}
1010
},
11+
"runArgs": [
12+
"--rm",
13+
"--name",
14+
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda12.2-pip"
15+
],
1116
"hostRequirements": {"gpu": "optional"},
1217
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.4": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {}
1419
},
1520
"overrideFeatureInstallOrder": [
1621
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.06
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
python-build:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.06
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [cpp-build, python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.06
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -56,7 +56,7 @@ jobs:
5656
if: github.ref_type == 'branch'
5757
needs: python-build
5858
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06
6060
with:
6161
arch: "amd64"
6262
branch: ${{ inputs.branch }}
@@ -68,7 +68,7 @@ jobs:
6868
sha: ${{ inputs.sha }}
6969
wheel-build-cuspatial:
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04
71+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06
7272
with:
7373
build_type: ${{ inputs.build_type || 'branch' }}
7474
branch: ${{ inputs.branch }}
@@ -78,7 +78,7 @@ jobs:
7878
wheel-publish-cuspatial:
7979
needs: wheel-build-cuspatial
8080
secrets: inherit
81-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.04
81+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06
8282
with:
8383
build_type: ${{ inputs.build_type || 'branch' }}
8484
branch: ${{ inputs.branch }}
@@ -87,7 +87,7 @@ jobs:
8787
package-name: cuspatial
8888
wheel-build-cuproj:
8989
secrets: inherit
90-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04
90+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06
9191
with:
9292
build_type: ${{ inputs.build_type || 'branch' }}
9393
branch: ${{ inputs.branch }}
@@ -97,7 +97,7 @@ jobs:
9797
wheel-publish-cuproj:
9898
needs: wheel-build-cuproj
9999
secrets: inherit
100-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.04
100+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06
101101
with:
102102
build_type: ${{ inputs.build_type || 'branch' }}
103103
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,40 @@ jobs:
2525
- wheel-tests-cuproj
2626
- devcontainer
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.04
28+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06
2929
checks:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.04
31+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.06
3232
with:
3333
enable_check_generated_files: false
3434
conda-cpp-build:
3535
needs: checks
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.04
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.06
3838
with:
3939
build_type: pull-request
4040
conda-cpp-tests:
4141
needs: conda-cpp-build
4242
secrets: inherit
43-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04
43+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.06
4444
with:
4545
build_type: pull-request
4646
conda-python-build:
4747
needs: conda-cpp-build
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.06
5050
with:
5151
build_type: pull-request
5252
conda-python-tests:
5353
needs: conda-python-build
5454
secrets: inherit
55-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.04
55+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06
5656
with:
5757
build_type: pull-request
5858
conda-notebook-tests:
5959
needs: conda-python-build
6060
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04
61+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06
6262
with:
6363
build_type: pull-request
6464
node_type: "gpu-v100-latest-1"
@@ -68,7 +68,7 @@ jobs:
6868
docs-build:
6969
needs: conda-python-build
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04
71+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06
7272
with:
7373
build_type: pull-request
7474
node_type: "gpu-v100-latest-1"
@@ -78,34 +78,34 @@ jobs:
7878
wheel-build-cuspatial:
7979
needs: checks
8080
secrets: inherit
81-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04
81+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06
8282
with:
8383
build_type: pull-request
8484
script: ci/build_wheel_cuspatial.sh
8585
wheel-tests-cuspatial:
8686
needs: wheel-build-cuspatial
8787
secrets: inherit
88-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04
88+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06
8989
with:
9090
build_type: pull-request
9191
script: ci/test_wheel_cuspatial.sh
9292
wheel-build-cuproj:
9393
needs: checks
9494
secrets: inherit
95-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04
95+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06
9696
with:
9797
build_type: pull-request
9898
script: ci/build_wheel_cuproj.sh
9999
wheel-tests-cuproj:
100100
needs: [wheel-build-cuspatial, wheel-build-cuproj]
101101
secrets: inherit
102-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04
102+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06
103103
with:
104104
build_type: pull-request
105105
script: ci/test_wheel_cuproj.sh
106106
devcontainer:
107107
secrets: inherit
108-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.04
108+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06
109109
with:
110110
arch: '["amd64"]'
111111
cuda: '["12.2"]'

‎.github/workflows/test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ on:
1616
jobs:
1717
conda-cpp-tests:
1818
secrets: inherit
19-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.04
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.06
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
2323
date: ${{ inputs.date }}
2424
sha: ${{ inputs.sha }}
2525
conda-python-tests:
2626
secrets: inherit
27-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.04
27+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06
2828
with:
2929
build_type: nightly
3030
branch: ${{ inputs.branch }}
3131
date: ${{ inputs.date }}
3232
sha: ${{ inputs.sha }}
3333
wheel-tests-cuspatial:
3434
secrets: inherit
35-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04
35+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06
3636
with:
3737
build_type: nightly
3838
branch: ${{ inputs.branch }}
@@ -41,7 +41,7 @@ jobs:
4141
script: ci/test_wheel_cuspatial.sh
4242
wheel-tests-cuproj:
4343
secrets: inherit
44-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04
44+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06
4545
with:
4646
build_type: nightly
4747
branch: ${{ inputs.branch }}

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
# cuspatial 24.06.00 (5 Jun 2024)
2+
3+
## 🚨 Breaking Changes
4+
5+
- Replace rmm::mr::device_memory_resource* with rmm::device_async_resource_ref ([#1373](https://github.com/rapidsai/cuspatial/pull/1373)) [@harrism](https://github.com/harrism)
6+
7+
## 🐛 Bug Fixes
8+
9+
- create conda ci test env in one step ([#1387](https://github.com/rapidsai/cuspatial/pull/1387)) [@msarahan](https://github.com/msarahan)
10+
11+
## 🛠️ Improvements
12+
13+
- Fix up imports for cudf changes ([#1383](https://github.com/rapidsai/cuspatial/pull/1383)) [@vyasr](https://github.com/vyasr)
14+
- Fix building cuspatial with CCCL main ([#1382](https://github.com/rapidsai/cuspatial/pull/1382)) [@trxcllnt](https://github.com/trxcllnt)
15+
- Fix quadtree spatial join OOMs on large numbers of input polygons ([#1381](https://github.com/rapidsai/cuspatial/pull/1381)) [@trxcllnt](https://github.com/trxcllnt)
16+
- Enable warnings-as-errors for cuproj tests ([#1379](https://github.com/rapidsai/cuspatial/pull/1379)) [@mroeschke](https://github.com/mroeschke)
17+
- Always use a static gtest and gbench ([#1377](https://github.com/rapidsai/cuspatial/pull/1377)) [@trxcllnt](https://github.com/trxcllnt)
18+
- Migrate to `{{ stdlib("c") }}` ([#1376](https://github.com/rapidsai/cuspatial/pull/1376)) [@hcho3](https://github.com/hcho3)
19+
- add --rm and --name to devcontainer run args ([#1375](https://github.com/rapidsai/cuspatial/pull/1375)) [@trxcllnt](https://github.com/trxcllnt)
20+
- Replace rmm::mr::device_memory_resource* with rmm::device_async_resource_ref ([#1373](https://github.com/rapidsai/cuspatial/pull/1373)) [@harrism](https://github.com/harrism)
21+
- Enable all tests for `arm` jobs ([#1365](https://github.com/rapidsai/cuspatial/pull/1365)) [@galipremsagar](https://github.com/galipremsagar)
22+
- Enable pytest failures on warnings on FutureWarnings (Replace deprecated `geopandas.dataset` module) ([#1360](https://github.com/rapidsai/cuspatial/pull/1360)) [@mroeschke](https://github.com/mroeschke)
23+
- Fix `JOIN_POINT_IN_POLYGON_LARGE_TEST_EXP` test ([#1346](https://github.com/rapidsai/cuspatial/pull/1346)) [@trxcllnt](https://github.com/trxcllnt)
24+
125
# cuSpatial 24.04.00 (10 Apr 2024)
226

327
## 🐛 Bug Fixes

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ An example command from the Release Selector:
113113
docker run --gpus all --pull always --rm -it \
114114
--shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 \
115115
-p 8888:8888 -p 8787:8787 -p 8786:8786 \
116-
nvcr.io/nvidia/rapidsai/notebooks:24.04-cuda11.8-py3.10
116+
nvcr.io/nvidia/rapidsai/notebooks:24.06-cuda11.8-py3.10
117117
```
118118

119119
### Install with Conda
@@ -125,7 +125,7 @@ cuSpatial can be installed with conda (miniconda, or the full Anaconda distribut
125125

126126
```shell
127127
conda install -c rapidsai -c conda-forge -c nvidia \
128-
cuspatial=24.04 python=3.11 cudatoolkit=11.8
128+
cuspatial=24.06 python=3.11 cudatoolkit=11.8
129129
```
130130
We also provide nightly Conda packages built from the HEAD of our latest development branch.
131131

@@ -184,7 +184,7 @@ To build and install cuSpatial from source please see the [build documentation](
184184
If you find cuSpatial useful in your published work, please consider citing the repository.
185185

186186
```bibtex
187-
@misc{cuspatial:24.04,
187+
@misc{cuspatial:24.06,
188188
author = {{NVIDIA Corporation}},
189189
title = {cuSpatial: GPU-Accelerated Geospatial and Spatiotemporal Algorithms},
190190
year = {2023},

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.04.00
1+
24.06.00

‎ci/build_docs.sh

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,24 @@ set -euo pipefail
66
rapids-logger "Create test conda environment"
77
. /opt/conda/etc/profile.d/conda.sh
88

9+
rapids-logger "Downloading artifacts from previous jobs"
10+
CPP_CHANNEL="$(rapids-download-conda-from-s3 cpp)"
11+
PYTHON_CHANNEL="$(rapids-download-conda-from-s3 python)"
12+
913
rapids-dependency-file-generator \
1014
--output conda \
1115
--file_key docs \
12-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
16+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
17+
--prepend-channel "${CPP_CHANNEL}" --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml
1318

1419
rapids-mamba-retry env create --yes -f env.yaml -n docs
1520
conda activate docs
1621

1722
rapids-print-env
1823

19-
rapids-logger "Downloading artifacts from previous jobs"
20-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
21-
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
22-
23-
rapids-mamba-retry install \
24-
--channel "${CPP_CHANNEL}" \
25-
--channel "${PYTHON_CHANNEL}" \
26-
libcuspatial \
27-
cuspatial \
28-
cuproj
29-
3024
export RAPIDS_VERSION="$(rapids-version)"
3125
export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
32-
export RAPIDS_VERSION_NUMBER="24.04"
26+
export RAPIDS_VERSION_NUMBER="24.06"
3327
export RAPIDS_DOCS_DIR="$(mktemp -d)"
3428

3529
rapids-logger "Build cuSpatial CPP docs"

‎ci/release/update-version.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; prin
4545
DEPENDENCIES=(
4646
cudf
4747
cuml
48+
cuspatial
4849
libcudf
50+
libcuspatial
51+
libcuspatial-tests
4952
librmm
5053
rmm
5154
cuspatial
@@ -81,4 +84,5 @@ sed_runner "s/notebooks:[0-9]\+\.[0-9]\+/notebooks:${NEXT_SHORT_TAG}/g" README.m
8184
find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do
8285
sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_SHORT_TAG}@g" "${filename}"
8386
sed_runner "s@rapidsai/devcontainers/features/rapids-build-utils:[0-9.]*@rapidsai/devcontainers/features/rapids-build-utils:${NEXT_SHORT_TAG_PEP440}@" "${filename}"
87+
sed_runner "s@rapids-\${localWorkspaceFolderBasename}-[0-9.]*@rapids-\${localWorkspaceFolderBasename}-${NEXT_SHORT_TAG}@g" "${filename}"
8488
done

0 commit comments

Comments
 (0)