From 0d864b8deac79d0668d460068e6bac9cd1acac47 Mon Sep 17 00:00:00 2001
From: Ajay Thorve <ajaythorve1994@gmail.com>
Date: Tue, 11 Jul 2023 09:58:21 -0700
Subject: [PATCH] Merge branch 'branch-23.08' of github.com:rapidsai/cuxfilter
 into pydata-theme

---
 .github/workflows/build.yaml                  |  6 +--
 .github/workflows/pr.yaml                     | 12 ++---
 .github/workflows/test-external.yaml          |  2 +-
 .github/workflows/test.yaml                   |  2 +-
 ci/release/update-version.sh                  | 23 +++++++---
 .../all_cuda-118_arch-x86_64.yaml             | 16 ++++---
 .../all_cuda-120_arch-x86_64.yaml             | 46 +++++++++++++++++++
 conda/recipes/cuxfilter/meta.yaml             |  9 ++--
 dependencies.yaml                             | 46 ++++++++++++-------
 9 files changed, 117 insertions(+), 45 deletions(-)
 create mode 100644 conda/environments/all_cuda-120_arch-x86_64.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 37445973..8871345e 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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120
     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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-120
     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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120
     with:
       arch: "amd64"
       branch: ${{ inputs.branch }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index c7fafb6d..6052ec7b 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -18,27 +18,27 @@ jobs:
       - conda-notebook-tests
       - docs-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-120
   checks:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-120
   conda-python-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-120
     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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120
     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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120
     with:
       build_type: pull-request
       node_type: "gpu-v100-latest-1"
@@ -48,7 +48,7 @@ jobs:
   docs-build:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120
     with:
       build_type: pull-request
       node_type: "gpu-v100-latest-1"
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
index 5a71495b..d2c2f4ae 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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-120
     with:
       build_type: branch
       node_type: "gpu-v100-latest-1"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 39b8ac83..c4ad5f46 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@branch-23.08
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-120
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index f3fe18ea..acb1ac9d 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright (c) 2020-2023, NVIDIA CORPORATION.
 #############################
 # cuxfilter Version Updater #
 #############################
@@ -22,6 +23,9 @@ NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
 NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
 NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 
+# Need to distutils-normalize the original version
+NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
+
 echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
 
 # Inplace sed replace; workaround for Linux and Mac
@@ -33,15 +37,20 @@ function sed_runner() {
 sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py
 sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py
 
-# bump cudf
-for FILE in conda/environments/*.yaml dependencies.yaml; do
-  sed_runner "s/cudf=.*/cudf=${NEXT_SHORT_TAG}/g" ${FILE};
-  sed_runner "s/cugraph=.*/cugraph=${NEXT_SHORT_TAG}/g" ${FILE};
-  sed_runner "s/cuspatial=.*/cuspatial=${NEXT_SHORT_TAG}/g" ${FILE};
-  sed_runner "s/dask-cuda=.*/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
-  sed_runner "s/dask-cudf=.*/dask-cudf=${NEXT_SHORT_TAG}/g" ${FILE};
+DEPENDENCIES=(
+  cudf
+  dask-cuda
+  dask-cudf
+  cugraph
+  cuspatial
+)
+for FILE in dependencies.yaml conda/environments/*.yaml; do
+  for DEP in "${DEPENDENCIES[@]}"; do
+    sed_runner "/- ${DEP}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE};
+  done
 done
 
+
 # README.md update
 sed_runner "s/version == ${CURRENT_SHORT_TAG}/version == ${NEXT_SHORT_TAG}/g" README.md
 sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" README.md
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 89832a73..d0b2a37d 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -7,12 +7,14 @@ channels:
 - nvidia
 dependencies:
 - bokeh>=2.4.2,<=2.5
-- cudatoolkit=11.8
-- cudf=23.08
-- cugraph=23.08
-- cuspatial=23.08
-- dask-cuda=23.08
-- dask-cudf=23.08
+- cuda-version=11.8
+- cudatoolkit
+- cudf==23.8.*
+- cugraph==23.8.*
+- cupy>=12.0.0
+- cuspatial==23.8.*
+- dask-cuda==23.8.*
+- dask-cudf==23.8.*
 - datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.15.0,<=1.15.4
@@ -28,7 +30,7 @@ dependencies:
 - numpydoc
 - packaging
 - pandoc<=2.0.0
-- panel >=0.14.0,<=0.14.1
+- panel>=0.14.0,<=0.14.1
 - pre-commit
 - pydata-sphinx-theme
 - pydeck>=0.3,<=0.5.0
diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
new file mode 100644
index 00000000..7f58f52c
--- /dev/null
+++ b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -0,0 +1,46 @@
+# This file is generated by `rapids-dependency-file-generator`.
+# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
+channels:
+- rapidsai
+- rapidsai-nightly
+- conda-forge
+- nvidia
+dependencies:
+- bokeh>=2.4.2,<=2.5
+- cuda-version=12.0
+- cudf==23.8.*
+- cugraph==23.8.*
+- cupy>=12.0.0
+- cuspatial==23.8.*
+- dask-cuda==23.8.*
+- dask-cudf==23.8.*
+- datashader>=0.15
+- geopandas>=0.11.0
+- holoviews>=1.15.0,<=1.15.4
+- ipython
+- jupyter-server-proxy
+- jupyter_sphinx
+- libwebp
+- nbsphinx
+- nodejs>=14
+- notebook>=0.5.0
+- numba>=0.57
+- numpy>=1.21
+- numpydoc
+- packaging
+- pandoc<=2.0.0
+- panel>=0.14.0,<=0.14.1
+- pre-commit
+- pydata-sphinx-theme
+- pydeck>=0.3,<=0.5.0
+- pyppeteer>=0.2.6
+- pyproj>=2.4,<=3.4
+- pytest
+- pytest-cov
+- python>=3.9,<3.11
+- recommonmark
+- sphinx
+- sphinx-markdown-tables
+- sphinx_rtd_theme
+- sphinxcontrib-websupport
+name: all_cuda-120_arch-x86_64
diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
index 636c554e..ba09730a 100644
--- a/conda/recipes/cuxfilter/meta.yaml
+++ b/conda/recipes/cuxfilter/meta.yaml
@@ -2,8 +2,9 @@
 
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
 {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
-{% set py_version = environ['CONDA_PY'] %}
 {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
+{% set cuda_major = cuda_version.split('.')[0] %}
+{% set py_version = environ['CONDA_PY'] %}
 {% set date_string = environ['RAPIDS_DATE_STRING'] %}
 
 package:
@@ -15,12 +16,13 @@ source:
 
 build:
   number: {{ GIT_DESCRIBE_NUMBER }}
-  string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
+  string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
 
 requirements:
   host:
     - python
     - setuptools
+    - cuda-version ={{ cuda_version }}
   run:
     - bokeh >=2.4.2,<=2.5
     - cudf ={{ minor_version }}
@@ -42,10 +44,11 @@ requirements:
     - pyppeteer >=0.2.6
     - pyproj >=2.4,<=3.4
     - python
+    - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
 
 test:
   requires:
-    - cudatoolkit ={{ cuda_version }}
+    - cuda-version ={{ cuda_version }}
   imports:
     - cuxfilter
 
diff --git a/dependencies.yaml b/dependencies.yaml
index 30345de1..59cb7c41 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -3,11 +3,11 @@ files:
   all:
     output: conda
     matrix:
-      cuda: ["11.8"]
+      cuda: ["11.8", "12.0"]
       arch: [x86_64]
     includes:
       - cudatoolkit
-      - develop
+      - checks
       - docs
       - notebook
       - py_version
@@ -28,7 +28,7 @@ files:
   checks:
     output: none
     includes:
-      - develop
+      - checks
   docs:
     output: none
     includes:
@@ -46,22 +46,30 @@ dependencies:
       - output_types: conda
         matrices:
           - matrix:
-              cuda: "11.2"
+              cuda: "12.0"
             packages:
-              - cudatoolkit=11.2
+              - cuda-version=12.0
           - matrix:
-              cuda: "11.4"
+              cuda: "11.8"
             packages:
-              - cudatoolkit=11.4
+              - cuda-version=11.8
+              - cudatoolkit
           - matrix:
               cuda: "11.5"
             packages:
-              - cudatoolkit=11.5
+              - cuda-version=11.5
+              - cudatoolkit
           - matrix:
-              cuda: "11.8"
+              cuda: "11.4"
             packages:
-              - cudatoolkit=11.8
-  develop:
+              - cuda-version=11.4
+              - cudatoolkit
+          - matrix:
+              cuda: "11.2"
+            packages:
+              - cuda-version=11.2
+              - cudatoolkit
+  checks:
     common:
       - output_types: [conda, requirements]
         packages:
@@ -89,7 +97,7 @@ dependencies:
           - notebook>=0.5.0
       - output_types: [conda]
         packages:
-          - cugraph=23.08
+          - cugraph==23.8.*
   py_version:
     specific:
       - output_types: conda
@@ -110,6 +118,10 @@ dependencies:
       - output_types: [conda, requirements]
         packages:
           - bokeh>=2.4.2,<=2.5
+          - cudf==23.8.*
+          - cuspatial==23.8.*
+          - dask-cuda==23.8.*
+          - dask-cudf==23.8.*
           - datashader>=0.15
           - geopandas>=0.11.0
           - holoviews>=1.15.0,<=1.15.4
@@ -119,16 +131,16 @@ dependencies:
           - numba>=0.57
           - numpy>=1.21
           - packaging
-          - panel >=0.14.0,<=0.14.1
+          - 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:
-          - cudf=23.08
-          - cuspatial=23.08
-          - dask-cuda=23.08
-          - dask-cudf=23.08
+          - cupy>=12.0.0
+      - output_types: requirements
+        packages:
+          - cupy-cuda11x>=12.0.0
   test_python:
     common:
       - output_types: [conda, requirements]