From be43b1b87f3d79422fb12c0e1e8aca492d3434a0 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:15:31 -0400 Subject: [PATCH 1/6] Fix broken symlink (#502) Follow up from #500 where a notebook was moved but the symlink in `notebooks` was not updated. Related: #419 Authors: - Ray Douglass (https://github.com/raydouglass) Approvers: - Ajay Thorve (https://github.com/AjayThorve) --- notebooks/10_minutes_to_cuxfilter.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/10_minutes_to_cuxfilter.ipynb b/notebooks/10_minutes_to_cuxfilter.ipynb index 529e5ee3..2f02ae00 120000 --- a/notebooks/10_minutes_to_cuxfilter.ipynb +++ b/notebooks/10_minutes_to_cuxfilter.ipynb @@ -1 +1 @@ -../docs/source/10_minutes_to_cuxfilter.ipynb \ No newline at end of file +../docs/source/user_guide/10_minutes_to_cuxfilter.ipynb \ No newline at end of file From bb00aeaca85b6d736f6b46e529052f0ac9ce3917 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 18 Jul 2023 14:27:02 -0500 Subject: [PATCH 2/6] Revert CUDA 12.0 CI workflows to branch-23.08. (#503) This PR reverts changes to the branch of `shared-action-workflows` used for CUDA 12 testing. Now that https://github.com/rapidsai/shared-action-workflows/pull/101 is merged, we can revert this. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cuxfilter/pull/503 --- .github/workflows/build.yaml | 10 +++++----- .github/workflows/pr.yaml | 16 ++++++++-------- .github/workflows/test.yaml | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8e60f788..79c53e97 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: python-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [python-build] secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -47,7 +47,7 @@ jobs: if: github.ref_type == 'branch' needs: python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08 with: arch: "amd64" branch: ${{ inputs.branch }} @@ -59,7 +59,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -70,7 +70,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e8943256..d3f7711e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -20,27 +20,27 @@ jobs: - wheel-build - wheel-tests secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.08 checks: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.08 conda-python-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.08 with: build_type: pull-request conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.08 with: build_type: pull-request run_codecov: false conda-notebook-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -50,7 +50,7 @@ jobs: docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -60,7 +60,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@branch-23.08 with: build_type: pull-request package-name: cuxfilter @@ -68,7 +68,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@branch-23.08 with: build_type: pull-request package-name: cuxfilter diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ab4a7908..a48c07c1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: conda-python-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.08 with: build_type: nightly branch: ${{ inputs.branch }} @@ -25,7 +25,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@branch-23.08 with: build_type: pull-request package-name: cuxfilter From 8e8c78f829dfdbd9c071f71d432490c439cf1e4f Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 18 Jul 2023 13:55:52 -0700 Subject: [PATCH 3/6] Followup: Revert CUDA 12.0 CI workflows to branch-23.08 (#504) This is a follow-up PR to #503, which reverts changes to the branch of shared-action-workflows used for CUDA 12 testing, for the pending workflows. Authors: - Ajay Thorve (https://github.com/AjayThorve) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/cuxfilter/pull/504 --- .github/workflows/test-external.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index d2c2f4ae..5a71495b 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -23,7 +23,7 @@ on: jobs: test-external: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08 with: build_type: branch node_type: "gpu-v100-latest-1" From e6c70b48e72f468de4cc0b11dea6618d2ff8d6f3 Mon Sep 17 00:00:00 2001 From: Divye Gala Date: Tue, 25 Jul 2023 15:18:05 -0400 Subject: [PATCH 4/6] Switch to new wheels pipeline (#506) Authors: - Divye Gala (https://github.com/divyegala) Approvers: - Vyas Ramasubramani (https://github.com/vyasr) - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/cuxfilter/pull/506 --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/pr.yaml | 12 ++++++------ .github/workflows/test.yaml | 6 +++--- ci/build_wheel.sh | 23 +++++++++++++++++++++++ ci/test_wheel.sh | 12 ++++++++++++ 5 files changed, 48 insertions(+), 13 deletions(-) create mode 100755 ci/build_wheel.sh create mode 100755 ci/test_wheel.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 79c53e97..cbd66355 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,18 +59,18 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-build.yaml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} - package-name: cuxfilter - package-dir: python/ + script: ci/build_wheel.sh + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1"))) wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-publish.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-publish.yaml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d3f7711e..1ba457e2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -60,16 +60,16 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-build.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-build.yaml@branch-23.08 with: build_type: pull-request - package-name: cuxfilter - package-dir: python/ + script: ci/build_wheel.sh + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1"))) wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-test.yaml@branch-23.08 with: build_type: pull-request - package-name: cuxfilter - test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" + script: ci/test_wheel.sh + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1"))) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a48c07c1..1e5324bc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,8 +25,8 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-pure-test.yml@branch-23.08 + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-test.yaml@branch-23.08 with: build_type: pull-request - package-name: cuxfilter - test-unittest: "python -m pytest -n 8 ./python/cuxfilter/tests" + script: ci/test_wheel.sh + matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1"))) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh new file mode 100755 index 00000000..0cb197f8 --- /dev/null +++ b/ci/build_wheel.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# Copyright (c) 2023, NVIDIA CORPORATION. + +set -euo pipefail + +source rapids-configure-sccache +source rapids-date-string + +# Use gha-tools rapids-pip-wheel-version to generate wheel version then +# update the necessary files +version_override="$(rapids-pip-wheel-version ${RAPIDS_DATE_STRING})" + +RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" + +ci/release/apply_wheel_modifications.sh ${version_override} "-${RAPIDS_PY_CUDA_SUFFIX}" +echo "The package name and/or version was modified in the package source. The git diff is:" +git diff + +cd python + +python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check + +RAPIDS_PY_WHEEL_NAME="cuxfilter_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 dist diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh new file mode 100755 index 00000000..5087d221 --- /dev/null +++ b/ci/test_wheel.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# Copyright (c) 2023, NVIDIA CORPORATION. + +set -eou pipefail + +RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" +RAPIDS_PY_WHEEL_NAME="cuxfilter_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist + +# echo to expand wildcard before adding `[extra]` requires for pip +python -m pip install $(echo ./dist/cuxfilter*.whl)[test] + +python -m pytest -n 8 ./python/cuxfilter/tests From e6eb47e9b40bafee9a7f568640d14b6e10575730 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 25 Jul 2023 16:52:01 -0500 Subject: [PATCH 5/6] Fix nightly wheel testing workflow. (#507) This PR fixes the nightly wheel testing workflow. It looks like this was copied straight from `pr.yaml` rather than adapted for nightly testing. ``` Invalid workflow file: .github/workflows/test.yaml#L26 The workflow is not valid. .github/workflows/test.yaml (Line: 26, Col: 12): Job 'wheel-tests' depends on unknown job 'wheel-build'. ``` https://github.com/rapidsai/cuxfilter/actions/runs/5653917680 Authors: - Bradley Dice (https://github.com/bdice) - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Ajay Thorve (https://github.com/AjayThorve) - Vyas Ramasubramani (https://github.com/vyasr) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cuxfilter/pull/507 --- .github/workflows/test.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1e5324bc..9440ed6b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -23,10 +23,12 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} wheel-tests: - needs: wheel-build secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/wheels-test.yaml@branch-23.08 with: - build_type: pull-request + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} script: ci/test_wheel.sh matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1"))) From f1f79f63c899a44a8606385bf985231b41f2cec3 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Mon, 31 Jul 2023 09:09:02 -0700 Subject: [PATCH 6/6] Fix dependencies - pyproj (#514) This PR fixes an issue raised in #511, which prevented the cuxfilter installation. This was caused by an indirect version conflict with pyproj (<3.4). This PR removes the `<3.4` pin, and also removes it as a direct run-dependency, since we only use it in notebooks. cc @exactlyallan resolves #511 Authors: - Ajay Thorve (https://github.com/AjayThorve) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Allan (https://github.com/exactlyallan) URL: https://github.com/rapidsai/cuxfilter/pull/514 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-120_arch-x86_64.yaml | 2 +- conda/recipes/cuxfilter/meta.yaml | 1 - dependencies.yaml | 2 +- python/pyproject.toml | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 342f8a83..99e3dcc0 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -35,7 +35,7 @@ dependencies: - pydata-sphinx-theme - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 -- pyproj>=2.4,<=3.4 +- pyproj>=2.4 - pytest - pytest-cov - pytest-xdist diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 77a12ea0..3b0a8aaf 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -34,7 +34,7 @@ dependencies: - pydata-sphinx-theme - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 -- pyproj>=2.4,<=3.4 +- pyproj>=2.4 - pytest - pytest-cov - pytest-xdist diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index 82400847..7afbb6aa 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -41,7 +41,6 @@ requirements: - panel >=0.14.0,<=0.14.1 - pydeck >=0.3,<=0.5.0 - pyppeteer >=0.2.6 - - pyproj >=2.4,<=3.4 - python - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/dependencies.yaml b/dependencies.yaml index 2faa4ac4..c420d021 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -128,6 +128,7 @@ dependencies: packages: - cugraph==23.8.* - dask-cuda==23.8.* + - pyproj>=2.4 py_version: specific: - output_types: conda @@ -161,7 +162,6 @@ dependencies: - panel>=0.14.0,<=0.14.1 - pydeck>=0.3,<=0.5.0 - pyppeteer>=0.2.6 - - pyproj>=2.4,<=3.4 - output_types: conda packages: - cupy>=12.0.0 diff --git a/python/pyproject.toml b/python/pyproject.toml index fd9d1588..c6f65f56 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -33,7 +33,6 @@ dependencies = [ "panel>=0.14.0,<=0.14.1", "pydeck>=0.3,<=0.5.0", "pyppeteer>=0.2.6", - "pyproj>=2.4,<=3.4", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers",