Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Mixed Geometry Column #1106

Draft
wants to merge 6 commits into
base: branch-23.08
Choose a base branch
from
Draft

Add Mixed Geometry Column #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e725d50
[skip ci]initial
isVoid Apr 27, 2023
733d1d8
add nullable column tests
isVoid May 1, 2023
0266138
[skip ci] block CI
isVoid May 1, 2023
4b76c44
cuSpatial pip packages (#1148)
trxcllnt Jun 2, 2023
d5325eb
Merge branch 'branch-23.06' of https://github.com/rapidsai/cuspatial …
isVoid Jun 5, 2023
e536944
Merge branch 'branch-23.08' of https://github.com/rapidsai/cuspatial …
isVoid Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"
Expand Down
12 changes: 7 additions & 5 deletions .devcontainer/conda/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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"
Expand All @@ -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": {
Expand Down
8 changes: 5 additions & 3 deletions .devcontainer/conda/isolated/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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": [
Expand All @@ -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"
Expand Down
12 changes: 7 additions & 5 deletions .devcontainer/conda/unified/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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"
Expand All @@ -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": {
Expand Down
12 changes: 7 additions & 5 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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"
Expand All @@ -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": {
Expand Down
9 changes: 0 additions & 9 deletions .devcontainer/opt/cuspatial/bin/post-attach-command.sh
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .devcontainer/opt/cuspatial/bin/post-create-command.sh
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .devcontainer/opt/cuspatial/bin/update-content-command.sh
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions .devcontainer/pip/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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": [
Expand All @@ -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"
},

Expand All @@ -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": {
Expand Down
13 changes: 7 additions & 6 deletions .devcontainer/pip/isolated/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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": [
Expand All @@ -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"
Expand All @@ -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": {
Expand Down
12 changes: 7 additions & 5 deletions .devcontainer/pip/unified/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"shutdownAction": "none",
"shutdownAction": "stopContainer",

"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
Expand All @@ -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": [
Expand All @@ -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"
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg → .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019-2022, NVIDIA CORPORATION.
# Copyright (c) 2019-2023, NVIDIA CORPORATION.

[flake8]
filename = *.py, *.pyx, *.pxd, *.pxi
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,24 @@ jobs:
node_type: "gpu-v100-latest-1"
run_script: "ci/build_docs.sh"
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
sha: ${{ inputs.sha }}
date: ${{ inputs.date }}
package-name: cuspatial
package-dir: python/cuspatial
skbuild-configure-options: "-DCUSPATIAL_BUILD_WHEELS=ON"
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.06
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
sha: ${{ inputs.sha }}
date: ${{ inputs.date }}
package-name: cuspatial
22 changes: 22 additions & 0 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
- conda-python-tests
- conda-notebook-tests
- docs-build
- wheel-build
- wheel-tests
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.08
checks:
Expand Down Expand Up @@ -70,3 +72,23 @@ jobs:
arch: "amd64"
container_image: "rapidsai/ci:latest"
run_script: "ci/build_docs.sh"
wheel-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
with:
build_type: pull-request
package-dir: python/cuspatial
package-name: cuspatial
skbuild-configure-options: "-DCUSPATIAL_BUILD_WHEELS=ON"
wheel-tests:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
with:
build_type: pull-request
package-name: cuspatial
test-smoketest: "python ./ci/wheel_smoke_test.py"
test-unittest: "python -m pytest -n 8 ./python/cuspatial/cuspatial/tests"
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'"
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'"
12 changes: 12 additions & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,15 @@ jobs:
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
with:
build_type: nightly
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
package-name: cuspatial
test-unittest: "python -m pytest -n 8 ./python/cuspatial/cuspatial/tests"
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'"
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'"
Loading