Skip to content

Commit b067655

Browse files
trxcllnttrxcllnt
committed
Merge branch-23.06 into branch-23.08
2 parents 9f990ea + 4b76c44 commit b067655

36 files changed

+575
-2756
lines changed

‎.devcontainer/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile:1.5
22

33
ARG CUDA=11.8
4-
ARG LLVM=15
5-
ARG RAPIDS=23.04
4+
ARG LLVM=16
5+
ARG RAPIDS=23.06
66
ARG DISTRO=ubuntu22.04
77
ARG REPO=rapidsai/devcontainers
88

@@ -19,12 +19,12 @@ ENV PYTHON_PACKAGE_MANAGER="${PYTHON_PACKAGE_MANAGER}"
1919

2020
USER coder
2121

22-
COPY --chown=coder:coder opt/cuspatial /opt/cuspatial
23-
24-
RUN /bin/bash -c 'mkdir -m 0755 -p ~/.{aws,cache,conda,config,local}'
22+
RUN /bin/bash -c 'mkdir -m 0755 -p ~/.{aws,cache,conda,config/pip,local}'
2523

2624
WORKDIR /home/coder/
2725

26+
ENV PYTHONSAFEPATH="1"
27+
ENV PYTHONUNBUFFERED="1"
2828
ENV PYTHONDONTWRITEBYTECODE="1"
2929

3030
ENV SCCACHE_REGION="us-east-2"

‎.devcontainer/conda/devcontainer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,16 +15,19 @@
1515
},
1616

1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
1919
},
2020

2121
"overrideFeatureInstallOrder": [
2222
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2323
],
2424

2525
"initializeCommand": [
26-
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-single-envs}"
26+
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}/single}"
2727
],
28+
"updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
29+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
30+
"postAttachCommand": ["rapids-make-conda-env"],
2831

2932
"containerEnv": {
3033
"DEFAULT_CONDA_ENV": "rapids"
@@ -37,8 +40,7 @@
3740
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3841
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
3942
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
40-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-single-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
41-
"source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
43+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}/single,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
4244
],
4345

4446
"customizations": {

‎.devcontainer/conda/isolated/.devcontainer/devcontainer.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,7 +15,7 @@
1515
},
1616

1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
1919
},
2020

2121
"overrideFeatureInstallOrder": [
@@ -27,8 +27,10 @@
2727
],
2828

2929
"updateContentCommand": [
30-
"/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename}"
30+
"/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename} && rapids-make-vscode-workspace --update"
3131
],
32+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
33+
"postAttachCommand": ["rapids-make-conda-env"],
3234

3335
"containerEnv": {
3436
"DEFAULT_CONDA_ENV": "rapids"

‎.devcontainer/conda/unified/.devcontainer/devcontainer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,16 +15,19 @@
1515
},
1616

1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
1919
},
2020

2121
"overrideFeatureInstallOrder": [
2222
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2323
],
2424

2525
"initializeCommand": [
26-
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-unified-envs}"
26+
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}/unified}"
2727
],
28+
"updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
29+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
30+
"postAttachCommand": ["rapids-make-conda-env"],
2831

2932
"containerEnv": {
3033
"DEFAULT_CONDA_ENV": "rapids"
@@ -39,8 +42,7 @@
3942
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
4043
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
4144
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
42-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-unified-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
43-
"source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
45+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}/unified,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
4446
],
4547

4648
"customizations": {

‎.devcontainer/devcontainer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,16 +15,19 @@
1515
},
1616

1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
1919
},
2020

2121
"overrideFeatureInstallOrder": [
2222
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2323
],
2424

2525
"initializeCommand": [
26-
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-single-envs}"
26+
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}/single}"
2727
],
28+
"updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
29+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
30+
"postAttachCommand": ["rapids-make-conda-env"],
2831

2932
"containerEnv": {
3033
"DEFAULT_CONDA_ENV": "rapids"
@@ -37,8 +40,7 @@
3740
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3841
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
3942
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
40-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-single-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
41-
"source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
43+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}/single,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
4244
],
4345

4446
"customizations": {

‎.devcontainer/opt/cuspatial/bin/post-attach-command.sh

-9
This file was deleted.

‎.devcontainer/opt/cuspatial/bin/post-create-command.sh

-3
This file was deleted.

‎.devcontainer/opt/cuspatial/bin/update-content-command.sh

-7
This file was deleted.

‎.devcontainer/pip/devcontainer.json

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -16,7 +16,7 @@
1616

1717
"features": {
1818
"ghcr.io/devcontainers/features/python:1": {},
19-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
19+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
2020
},
2121

2222
"overrideFeatureInstallOrder": [
@@ -25,10 +25,15 @@
2525
],
2626

2727
"initializeCommand": [
28-
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,configlWorkspaceFolderBasename}-single-local}"
28+
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/${localWorkspaceFolderBasename}/single}"
2929
],
30+
"updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
31+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
32+
"postAttachCommand": ["rapids-make-pip-env"],
3033

3134
"containerEnv": {
35+
"PYTHONSAFEPATH": "true",
36+
"PYTHONUNBUFFERED": "true",
3237
"DEFAULT_VIRTUAL_ENV": "rapids"
3338
},
3439

@@ -38,8 +43,7 @@
3843
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
3944
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
4045
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
41-
"source=${localWorkspaceFolder}/../.${localWorkspaceFolderBasename}-single-local,target=/home/coder/.local,type=bind,consistency=consistent",
42-
"source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
46+
"source=${localWorkspaceFolder}/../.local/${localWorkspaceFolderBasename}/single,target=/home/coder/.local,type=bind,consistency=consistent"
4347
],
4448

4549
"customizations": {

‎.devcontainer/pip/isolated/.devcontainer/devcontainer.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -16,7 +16,7 @@
1616

1717
"features": {
1818
"ghcr.io/devcontainers/features/python:1": {},
19-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
19+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
2020
},
2121

2222
"overrideFeatureInstallOrder": [
@@ -25,12 +25,14 @@
2525
],
2626

2727
"initializeCommand": [
28-
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,local}"
28+
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip}"
2929
],
3030

3131
"updateContentCommand": [
32-
"/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename}"
32+
"/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename} && rapids-make-vscode-workspace --update"
3333
],
34+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
35+
"postAttachCommand": ["rapids-make-pip-env"],
3436

3537
"containerEnv": {
3638
"DEFAULT_VIRTUAL_ENV": "rapids"
@@ -41,8 +43,7 @@
4143
"mounts": [
4244
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
4345
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
44-
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
45-
"source=${localWorkspaceFolder}/../.local,target=/home/coder/.local,type=bind,consistency=consistent"
46+
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent"
4647
],
4748

4849
"customizations": {

‎.devcontainer/pip/unified/.devcontainer/devcontainer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"shutdownAction": "none",
2+
"shutdownAction": "stopContainer",
33

44
"build": {
55
"context": "${localWorkspaceFolder}/.devcontainer",
@@ -16,7 +16,7 @@
1616

1717
"features": {
1818
"ghcr.io/devcontainers/features/python:1": {},
19-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
19+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
2020
},
2121

2222
"overrideFeatureInstallOrder": [
@@ -25,8 +25,11 @@
2525
],
2626

2727
"initializeCommand": [
28-
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,${localWorkspaceFolderBasename}-unified-local}"
28+
"/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/${localWorkspaceFolderBasename}/unified}"
2929
],
30+
"updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
31+
"postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
32+
"postAttachCommand": ["rapids-make-pip-env"],
3033

3134
"containerEnv": {
3235
"DEFAULT_VIRTUAL_ENV": "rapids"
@@ -40,8 +43,7 @@
4043
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
4144
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
4245
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
43-
"source=${localWorkspaceFolder}/../.${localWorkspaceFolderBasename}-unified-local,target=/home/coder/.local,type=bind,consistency=consistent",
44-
"source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
46+
"source=${localWorkspaceFolder}/../.local/${localWorkspaceFolderBasename}/unified,target=/home/coder/.local,type=bind,consistency=consistent"
4547
],
4648

4749
"customizations": {

‎setup.cfg ‎.flake8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2022, NVIDIA CORPORATION.
1+
# Copyright (c) 2019-2023, NVIDIA CORPORATION.
22

33
[flake8]
44
filename = *.py, *.pyx, *.pxd, *.pxi

‎.github/workflows/build.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,24 @@ jobs:
6666
node_type: "gpu-v100-latest-1"
6767
run_script: "ci/build_docs.sh"
6868
sha: ${{ inputs.sha }}
69+
wheel-build:
70+
secrets: inherit
71+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
72+
with:
73+
build_type: ${{ inputs.build_type || 'branch' }}
74+
branch: ${{ inputs.branch }}
75+
sha: ${{ inputs.sha }}
76+
date: ${{ inputs.date }}
77+
package-name: cuspatial
78+
package-dir: python/cuspatial
79+
skbuild-configure-options: "-DCUSPATIAL_BUILD_WHEELS=ON"
80+
wheel-publish:
81+
needs: wheel-build
82+
secrets: inherit
83+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.06
84+
with:
85+
build_type: ${{ inputs.build_type || 'branch' }}
86+
branch: ${{ inputs.branch }}
87+
sha: ${{ inputs.sha }}
88+
date: ${{ inputs.date }}
89+
package-name: cuspatial

‎.github/workflows/pr.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
- conda-python-tests
2020
- conda-notebook-tests
2121
- docs-build
22+
- wheel-build
23+
- wheel-tests
2224
secrets: inherit
2325
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.08
2426
checks:
@@ -70,3 +72,23 @@ jobs:
7072
arch: "amd64"
7173
container_image: "rapidsai/ci:latest"
7274
run_script: "ci/build_docs.sh"
75+
wheel-build:
76+
needs: checks
77+
secrets: inherit
78+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
79+
with:
80+
build_type: pull-request
81+
package-dir: python/cuspatial
82+
package-name: cuspatial
83+
skbuild-configure-options: "-DCUSPATIAL_BUILD_WHEELS=ON"
84+
wheel-tests:
85+
needs: wheel-build
86+
secrets: inherit
87+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
88+
with:
89+
build_type: pull-request
90+
package-name: cuspatial
91+
test-smoketest: "python ./ci/wheel_smoke_test.py"
92+
test-unittest: "python -m pytest -n 8 ./python/cuspatial/cuspatial/tests"
93+
test-before-amd64: "apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libgdal-dev && python -m pip install --no-binary fiona 'fiona>=1.8.19,<1.9'"
94+
test-before-arm64: "apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libgdal-dev && python -m pip install --no-binary fiona 'fiona>=1.8.19,<1.9'"

‎.github/workflows/test.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,15 @@ jobs:
3030
branch: ${{ inputs.branch }}
3131
date: ${{ inputs.date }}
3232
sha: ${{ inputs.sha }}
33+
wheel-tests:
34+
secrets: inherit
35+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
36+
with:
37+
build_type: nightly
38+
branch: ${{ inputs.branch }}
39+
date: ${{ inputs.date }}
40+
sha: ${{ inputs.sha }}
41+
package-name: cuspatial
42+
test-unittest: "python -m pytest -n 8 ./python/cuspatial/cuspatial/tests"
43+
test-before-amd64: "apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libgdal-dev && python -m pip install --no-binary fiona 'fiona>=1.8.19,<1.9'"
44+
test-before-arm64: "apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libgdal-dev && python -m pip install --no-binary fiona 'fiona>=1.8.19,<1.9'"

0 commit comments

Comments
 (0)