[RELEASE] integration v21.12

ci/axis/nightly-arm64.yaml

@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
 RAPIDS_VER:
-  - 21.10.00a
+  - 21.12.00a
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
 

ci/axis/nightly.yaml

@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
 RAPIDS_VER:
-  - 21.10.00a
+  - 21.12.00a
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
   - 11.0

ci/axis/release-arm64.yaml

@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Y (major.minor.patch) version to match tag
 RAPIDS_VER:
-  - "21.10.00"
+  - "21.12.00"
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
 

ci/axis/release.yaml

@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Y (major.minor.patch) version to match tag
 RAPIDS_VER:
-  - "21.10.00"
+  - "21.12.00"
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
   - 11.0

ci/axis/tests.yaml

@@ -1,14 +1,15 @@
 RUNTIME_DOCKER_REPO:
-  - rapidsai/rapidsai-nightly
+  - rapidsai/rapidsai-core-nightly
 
 DOCKER_REPO:
   - rapidsai/rapidsai-core-dev-nightly
 
 # Use M.X (major.minor) version
 RAPIDS_VER:
-  - "21.10"
+  - "21.12"
 
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
   - 11.0

ci/cpu/build.sh

@@ -19,12 +19,9 @@ export HOME="$WORKSPACE"
 # Set recipe paths
 CONDA_XGBOOST_RECIPE="conda/recipes/rapids-xgboost"
 CONDA_RAPIDS_RECIPE="conda/recipes/rapids"
-CONDA_RAPIDS_BLAZING_RECIPE="conda/recipes/rapids-blazing"
 CONDA_RAPIDS_BUILD_RECIPE="conda/recipes/rapids-build-env"
 CONDA_RAPIDS_NOTEBOOK_RECIPE="conda/recipes/rapids-notebook-env"
 CONDA_RAPIDS_DOC_RECIPE="conda/recipes/rapids-doc-env"
-CONDA_BLAZING_BUILD_RECIPE="conda/recipes/blazingsql-build-env"
-CONDA_BLAZING_NOTEBOOK_RECIPE="conda/recipes/blazingsql-notebook-env"
 
 # Allow insecure connections for conda-mirror
 echo "ssl_verify: False" >> /conda/.condarc
@@ -55,16 +52,8 @@ ARCH=$(uname -m)
 function build_pkg {
   # Build pkg
   gpuci_logger "Start conda build for '${1}'..."
-  if [[ "${1}" == "${CONDA_BLAZING_NOTEBOOK_RECIPE}" ]]; then
-    gpuci_conda_retry build --override-channels -c blazingsql-nightly -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c pytorch -c conda-forge \
-                --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1}
-  elif [[ "${1}" == *"BLAZING"* ]]; then
-    gpuci_conda_retry build --override-channels -c blazingsql-nightly -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \
-                --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1}
-  else
-    gpuci_conda_retry build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \
-                --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1}
-  fi
+  gpuci_conda_retry build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \
+    --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1}
 }
 
 function run_builds {
@@ -93,27 +82,19 @@ function upload_builds {
     if [[ -n $(ls /conda/conda-bld/${ARCH_DIR}/* | grep -i rapids.*.tar.bz2) ]]; then
       ls /conda/conda-bld/${ARCH_DIR}/* | grep -i rapids.*.tar.bz2
     fi
-    if [[ -n $(ls /conda/conda-bld/${ARCH_DIR}/* | grep -i blazingsql.*.tar.bz2) ]]; then
-      ls /conda/conda-bld/${ARCH_DIR}/* | grep -i blazingsql.*.tar.bz2
-    fi
 
     gpuci_logger "Starting upload..."
     if [[ -n $(ls /conda/conda-bld/${ARCH_DIR}/* | grep -i rapids.*.tar.bz2) ]]; then
       ls /conda/conda-bld/${ARCH_DIR}/* | grep -i rapids.*.tar.bz2 | xargs gpuci_retry \
         anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --skip-existing --no-progress
     fi
-    if [[ -n $(ls /conda/conda-bld/${ARCH_DIR}/* | grep -i blazingsql.*.tar.bz2) ]]; then
-      ls /conda/conda-bld/${ARCH_DIR}/* | grep -i blazingsql.*.tar.bz2 | xargs gpuci_retry \
-        anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --skip-existing --no-progress
-    fi
   fi
 }
 
 if [[ "$BUILD_PKGS" == "meta" || -z "$BUILD_PKGS" ]] ; then
   # Run builds for meta-pkgs
   run_builds $CONDA_XGBOOST_RECIPE
   run_builds $CONDA_RAPIDS_RECIPE
-  run_builds $CONDA_RAPIDS_BLAZING_RECIPE || true
 fi
 
 if [[ "$BUILD_PKGS" == "env" || -z "$BUILD_PKGS" ]] ; then
@@ -123,8 +104,6 @@ if [[ "$BUILD_PKGS" == "env" || -z "$BUILD_PKGS" ]] ; then
   # Bypass not supported packages for arm64
   if [ "${ARCH}" != "aarch64" ]; then
     run_builds $CONDA_RAPIDS_DOC_RECIPE
-    run_builds $CONDA_BLAZING_BUILD_RECIPE
-    run_builds $CONDA_BLAZING_NOTEBOOK_RECIPE
   fi
 fi
 

ci/release/update-version.sh

@@ -30,6 +30,8 @@ function sed_runner() {
 }
 
 # Axis file update
-sed_runner "/RAPIDS_VER/a \ \ \- ${NEXT_FULL_TAG}a" ci/axis/nightly.yaml
-sed_runner "/RAPIDS_VER/a \ \ \- \"${NEXT_FULL_TAG}\"" ci/axis/release.yaml
-sed_runner "/RAPIDS_VER/a \ \ \- \"${NEXT_SHORT_TAG}\"" ci/axis/tests.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- ${NEXT_FULL_TAG}a/}" ci/axis/nightly.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- ${NEXT_FULL_TAG}a/}" ci/axis/nightly-arm64.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- \"${NEXT_FULL_TAG}\"/}" ci/axis/release.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- \"${NEXT_FULL_TAG}\"/}" ci/axis/release-arm64.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- \"${NEXT_SHORT_TAG}\"/}" ci/axis/tests.yaml

conda/recipes/rapids-build-env/meta.yaml

@@ -94,6 +94,7 @@ requirements:
     - lightgbm
     - make
     - mimesis {{ mimesis_version }}
+    - mock
     - moto {{ moto_version }}
     - mypy {{ mypy_version }}
     - nccl {{ nccl_version }}
@@ -109,6 +110,7 @@ requirements:
     - panel {{ panel_version }}
     - pickle5  # [py<38]
     - pkg-config
+    - pre-commit
     - protobuf {{ protobuf_version }}
     - psutil
     - pyarrow {{ arrow_version }}

conda/recipes/rapids/meta.yaml

@@ -56,6 +56,7 @@ requirements:
     - dask-cuda ={{ minor_version }}.*
     - rapids-xgboost ={{ minor_version }}.*
     - rmm ={{ minor_version }}.*
+    - ptxcompiler  # [linux64]  # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler
 
 test:            # [linux64]
   imports:       # [linux64]