Merge branch 'branch-23.10' into cccl-update-2.1.0

rapidsai · Jul 27, 2023 · b75ee7c · b75ee7c
2 parents fdd2ceb + bd3085c
commit b75ee7c
Show file tree

Hide file tree

Showing 417 changed files with 22,523 additions and 10,725 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1.5
 
 ARG CUDA=11.8
-ARG LLVM=15
-ARG RAPIDS=23.04
+ARG LLVM=16
+ARG RAPIDS=23.06
 ARG DISTRO=ubuntu22.04
 ARG REPO=rapidsai/devcontainers
 
@@ -19,12 +19,12 @@ ENV PYTHON_PACKAGE_MANAGER="${PYTHON_PACKAGE_MANAGER}"
 
 USER coder
 
-COPY --chown=coder:coder opt/cuspatial /opt/cuspatial
-
-RUN /bin/bash -c 'mkdir -m 0755 -p ~/.{aws,cache,conda,config,local}'
+RUN /bin/bash -c 'mkdir -m 0755 -p ~/.{aws,cache,conda,config/pip,local}'
 
 WORKDIR /home/coder/
 
+ENV PYTHONSAFEPATH="1"
+ENV PYTHONUNBUFFERED="1"
 ENV PYTHONDONTWRITEBYTECODE="1"
 
 ENV SCCACHE_REGION="us-east-2"

diff --git a/.devcontainer/conda/devcontainer.json b/.devcontainer/conda/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,16 +15,19 @@
   },
 
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
   ],
 
   "initializeCommand": [
-    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-single-envs}"
+    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}/single}"
   ],
+  "updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-conda-env"],
 
   "containerEnv": {
     "DEFAULT_CONDA_ENV": "rapids"
@@ -37,8 +40,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-single-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}/single,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
   ],
 
   "customizations": {

diff --git a/.devcontainer/conda/isolated/.devcontainer/devcontainer.json b/.devcontainer/conda/isolated/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,7 +15,7 @@
   },
 
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
@@ -27,8 +27,10 @@
   ],
 
   "updateContentCommand": [
-    "/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename}"
+    "/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename} && rapids-make-vscode-workspace --update"
   ],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-conda-env"],
 
   "containerEnv": {
     "DEFAULT_CONDA_ENV": "rapids"

diff --git a/.devcontainer/conda/unified/.devcontainer/devcontainer.json b/.devcontainer/conda/unified/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,16 +15,19 @@
   },
 
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
   ],
 
   "initializeCommand": [
-    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-unified-envs}"
+    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}/unified}"
   ],
+  "updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-conda-env"],
 
   "containerEnv": {
     "DEFAULT_CONDA_ENV": "rapids"
@@ -39,8 +42,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-unified-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}/unified,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
   ],
 
   "customizations": {

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -15,16 +15,19 @@
   },
 
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
   ],
 
   "initializeCommand": [
-    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-single-envs}"
+    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}/single}"
   ],
+  "updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-conda-env"],
 
   "containerEnv": {
     "DEFAULT_CONDA_ENV": "rapids"
@@ -37,8 +40,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-single-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}/single,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
   ],
 
   "customizations": {

diff --git a/.devcontainer/opt/cuspatial/bin/post-attach-command.sh b/.devcontainer/opt/cuspatial/bin/post-attach-command.sh
diff --git a/.devcontainer/opt/cuspatial/bin/post-create-command.sh b/.devcontainer/opt/cuspatial/bin/post-create-command.sh
diff --git a/.devcontainer/opt/cuspatial/bin/update-content-command.sh b/.devcontainer/opt/cuspatial/bin/update-content-command.sh
diff --git a/.devcontainer/pip/devcontainer.json b/.devcontainer/pip/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -16,7 +16,7 @@
 
   "features": {
     "ghcr.io/devcontainers/features/python:1": {},
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
@@ -25,10 +25,15 @@
   ],
 
   "initializeCommand": [
-    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,configlWorkspaceFolderBasename}-single-local}"
+    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/${localWorkspaceFolderBasename}/single}"
   ],
+  "updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-pip-env"],
 
   "containerEnv": {
+    "PYTHONSAFEPATH": "true",
+    "PYTHONUNBUFFERED": "true",
     "DEFAULT_VIRTUAL_ENV": "rapids"
   },
 
@@ -38,8 +43,7 @@
     "source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.${localWorkspaceFolderBasename}-single-local,target=/home/coder/.local,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.local/${localWorkspaceFolderBasename}/single,target=/home/coder/.local,type=bind,consistency=consistent"
   ],
 
   "customizations": {

diff --git a/.devcontainer/pip/isolated/.devcontainer/devcontainer.json b/.devcontainer/pip/isolated/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -16,7 +16,7 @@
 
   "features": {
     "ghcr.io/devcontainers/features/python:1": {},
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
@@ -25,12 +25,14 @@
   ],
 
   "initializeCommand": [
-    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,local}"
+    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip}"
   ],
 
   "updateContentCommand": [
-    "/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename}"
+    "/bin/bash", "-c", "cp -ar /workspaces/${localWorkspaceFolderBasename} /home/coder/${localWorkspaceFolderBasename} && rapids-make-vscode-workspace --update"
   ],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-pip-env"],
 
   "containerEnv": {
     "DEFAULT_VIRTUAL_ENV": "rapids"
@@ -41,8 +43,7 @@
   "mounts": [
     "source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.local,target=/home/coder/.local,type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent"
   ],
 
   "customizations": {

diff --git a/.devcontainer/pip/unified/.devcontainer/devcontainer.json b/.devcontainer/pip/unified/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "shutdownAction": "none",
+  "shutdownAction": "stopContainer",
 
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
@@ -16,7 +16,7 @@
 
   "features": {
     "ghcr.io/devcontainers/features/python:1": {},
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:latest": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
   },
 
   "overrideFeatureInstallOrder": [
@@ -25,8 +25,11 @@
   ],
 
   "initializeCommand": [
-    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,${localWorkspaceFolderBasename}-unified-local}"
+    "/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/${localWorkspaceFolderBasename}/unified}"
   ],
+  "updateContentCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postCreateCommand": ["rapids-make-vscode-workspace", "--update"],
+  "postAttachCommand": ["rapids-make-pip-env"],
 
   "containerEnv": {
     "DEFAULT_VIRTUAL_ENV": "rapids"
@@ -40,8 +43,7 @@
     "source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.${localWorkspaceFolderBasename}-unified-local,target=/home/coder/.local,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/.devcontainer/opt/${localWorkspaceFolderBasename},target=/opt/${localWorkspaceFolderBasename},type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.local/${localWorkspaceFolderBasename}/unified,target=/home/coder/.local,type=bind,consistency=consistent"
   ],
 
   "customizations": {

diff --git a/setup.cfg → .flake8 b/setup.cfg → .flake8
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2022, NVIDIA CORPORATION.
+# Copyright (c) 2019-2023, NVIDIA CORPORATION.
 
 [flake8]
 filename = *.py, *.pyx, *.pxd, *.pxi

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -16,7 +16,7 @@
 name: Bug Report
 description: File a bug report for cuSpatial
 title: "[BUG]: "
-labels: ["bug", "? - Needs Triage"]
+labels: ["bug"]
 
 body:
   - type: markdown

diff --git a/.github/ISSUE_TEMPLATE/documentation_request.yml b/.github/ISSUE_TEMPLATE/documentation_request.yml
@@ -16,7 +16,7 @@
 name: Documentation Request
 description: Request updates or additions to cuSpatial's documentation
 title: "[DOC]: "
-labels: ["doc", "? - Needs Triage"]
+labels: ["doc"]
 
 body:
   - type: markdown

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -16,7 +16,7 @@
 name: Feature Request
 description: Request new or improved functionality or changes to existing cuSpatial functionality
 title: "[FEA]: "
-labels: ["feature request", "? - Needs Triage"]
+labels: ["feature request"]
 
 body:
   - type: markdown

diff --git a/.github/workflows/add_issue_to_project.yml b/.github/workflows/add_issue_to_project.yml