From 2cda4ed481347acd0e1be30710bcb31c60c7b3d0 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Thu, 16 Sep 2021 17:20:30 -0400 Subject: [PATCH 01/19] DOC v21.12 Updates --- ci/axis/nightly-arm64.yaml | 2 +- ci/axis/nightly.yaml | 2 +- ci/axis/release.yaml | 2 +- ci/axis/tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml index 76224301..79f8ea9b 100644 --- a/ci/axis/nightly-arm64.yaml +++ b/ci/axis/nightly-arm64.yaml @@ -6,7 +6,7 @@ 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: diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index e3913ca2..ea905ed6 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -6,7 +6,7 @@ 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: diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 729c97d8..1def2479 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -6,7 +6,7 @@ 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: diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 64b1055e..20e1d885 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -6,7 +6,7 @@ DOCKER_REPO: # Use M.X (major.minor) version RAPIDS_VER: - - "21.10" + - "21.12" CUDA_VER: - 11.2 From 1d733a33766fbe3498bb871f36edb9b9c63d25fe Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 27 Sep 2021 08:50:11 -0500 Subject: [PATCH 02/19] Update versions.yaml --- conda/recipes/versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index d021c00a..30dd1e5e 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -47,11 +47,11 @@ cupy_version: cython_version: - '>=0.29.17,<0.30' dask_version: - - '=2021.9.1' + - '>=2021.9.1' datashader_version: - '>=0.11.1,<0.12' distributed_version: - - '=2021.9.1' + - '>=2021.9.1' dlpack_version: - '>=0.5,<0.6.0a0' double_conversion_version: From ba9a858a767293c39b46eed236ee95b2eb0be851 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 11 Oct 2021 12:44:39 -0400 Subject: [PATCH 03/19] Update Runtime Image for Nightly Tests This PR updates the image that's used for our nightly tests. There is currently no `rapidsai-nightly` images planned for `21.12` since BlazingSQL has been discontinued, so this PR switches the image to use `rapidsai-core-nightly`. --- ci/axis/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 7089e19d..a0a343f4 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -1,5 +1,5 @@ RUNTIME_DOCKER_REPO: - - rapidsai/rapidsai-nightly + - rapidsai/rapidsai-core-nightly DOCKER_REPO: - rapidsai/rapidsai-core-dev-nightly From f08e558c10f81af0aa30fd83785911e47b6048dd Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 11 Oct 2021 10:19:23 -0700 Subject: [PATCH 04/19] Add pre-commit to environment. --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index b5fadf0d..05bf8b56 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -109,6 +109,7 @@ requirements: - panel {{ panel_version }} - pickle5 # [py<38] - pkg-config + - pre_commit - protobuf {{ protobuf_version }} - psutil - pyarrow {{ arrow_version }} From 60649a1bad748b33d358d96be5910f43c64d78c4 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 11 Oct 2021 11:32:04 -0700 Subject: [PATCH 05/19] Switch to update name for conda pre-commit package. --- conda/recipes/rapids-build-env/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 05bf8b56..89bb2adc 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -109,7 +109,7 @@ requirements: - panel {{ panel_version }} - pickle5 # [py<38] - pkg-config - - pre_commit + - pre-commit - protobuf {{ protobuf_version }} - psutil - pyarrow {{ arrow_version }} From e77c510b4af8e3d919734c44f7f347141eb3e3f4 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Tue, 19 Oct 2021 12:51:49 +0200 Subject: [PATCH 06/19] Remove Blazing Signed-off-by: Jordan Jacobelli --- ci/cpu/build.sh | 25 +------- conda/recipes/blazingsql-build-env/meta.yaml | 59 ----------------- .../recipes/blazingsql-notebook-env/meta.yaml | 63 ------------------- conda/recipes/rapids-blazing/LICENSE | 1 - conda/recipes/rapids-blazing/meta.yaml | 61 ------------------ 5 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 conda/recipes/blazingsql-build-env/meta.yaml delete mode 100644 conda/recipes/blazingsql-notebook-env/meta.yaml delete mode 100644 conda/recipes/rapids-blazing/LICENSE delete mode 100644 conda/recipes/rapids-blazing/meta.yaml diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 131a131d..c8464f07 100644 --- a/ci/cpu/build.sh +++ b/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,19 +82,12 @@ 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 } @@ -113,7 +95,6 @@ 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 diff --git a/conda/recipes/blazingsql-build-env/meta.yaml b/conda/recipes/blazingsql-build-env/meta.yaml deleted file mode 100644 index 696f8fc1..00000000 --- a/conda/recipes/blazingsql-build-env/meta.yaml +++ /dev/null @@ -1,59 +0,0 @@ -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} -{% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} -{% set py_version = environ.get('CONDA_PY', 36) %} - -### -# Versions referenced below are set in `conda/recipe/*versions.yaml` except for -# those set above (e.g. `cuda_version`) -# -# gpuCI loads the correct file based on the build type (NIGHTLY or RELEASE) in -# `ci/cpu/build-env.sh` and `ci/axis/*.yaml` -# -# Manual builds need to use the `conda build` flag of `-m .yaml` -# to set these versions -### - -package: - name: blazingsql-build-env - version: {{ rapids_version }} - -source: - path: ../../.. - -build: - number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} - script_env: - - CUDA_VERSION - - RAPIDS_VER - - VERSION_SUFFIX - -requirements: - build: - - python - run: - - aws-sdk-cpp - - cmake {{ cmake_version }} - - cppzmq - - cudatoolkit {{ cuda_version }}.* - - cython {{ cython_version }} - - dlpack {{ dlpack_version }} - - google-cloud-cpp {{ google_cloud_cpp_version }} - - gtest {{ gtest_version }} - - jpype1 - - maven - - mysql-connector-cpp {{ mysql_connector_cpp_version }} - - netifaces - - nlohmann_json {{ nlohmann_json_version }} - - ninja - - openjdk {{ openjdk_version }} - - pyhive - - python - - setuptools - - spdlog {{ spdlog_version }} - - zeromq - -about: - home: http://www.blazingsql.com/ - license: Apache-2.0 - license_family: Apache diff --git a/conda/recipes/blazingsql-notebook-env/meta.yaml b/conda/recipes/blazingsql-notebook-env/meta.yaml deleted file mode 100644 index ead4841f..00000000 --- a/conda/recipes/blazingsql-notebook-env/meta.yaml +++ /dev/null @@ -1,63 +0,0 @@ -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} -{% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} -{% set py_version = environ.get('CONDA_PY', 36) %} - -### -# Versions referenced below are set in `conda/recipe/*versions.yaml` except for -# those set above (e.g. `cuda_version`) -# -# gpuCI loads the correct file based on the build type (NIGHTLY or RELEASE) in -# `ci/cpu/build-env.sh` and `ci/axis/*.yaml` -# -# Manual builds need to use the `conda build` flag of `-m .yaml` -# to set these versions -### - -package: - name: blazingsql-notebook-env - version: {{ rapids_version }} - -source: - path: ../../.. - -build: - number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} - script_env: - - CUDA_VERSION - - RAPIDS_VER - - VERSION_SUFFIX - -requirements: - build: - - python - run: - - colorcet - - cudatoolkit {{ cuda_version }} - - dash - - dask - - dask-ml - - datashader - - fbprophet - - geoviews - - holoviews - - ipywidgets - - jupyter-dash - - matplotlib - - networkx - - panel {{ panel_version }} - - plotly - - python-graphviz - - pytorch {{ pytorch_version }} - - s3fs {{ s3fs_version }} - - scikit-learn - - scipy - - seaborn - - spacy - - statsmodels - - xgboost - -about: - home: http://www.blazingsql.com/ - license: Apache-2.0 - license_family: Apache diff --git a/conda/recipes/rapids-blazing/LICENSE b/conda/recipes/rapids-blazing/LICENSE deleted file mode 100644 index d00c6281..00000000 --- a/conda/recipes/rapids-blazing/LICENSE +++ /dev/null @@ -1 +0,0 @@ -The license of this package is a combination of the dependent packages contained herein. diff --git a/conda/recipes/rapids-blazing/meta.yaml b/conda/recipes/rapids-blazing/meta.yaml deleted file mode 100644 index 198c9251..00000000 --- a/conda/recipes/rapids-blazing/meta.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{% set rapids_version = environ.get('RAPIDS_VER', '0.0.0') + environ.get('VERSION_SUFFIX', '') %} -{% set minor_version = rapids_version.split('.')[0] + '.' + rapids_version.split('.')[1] %} -{% set cuda_version = '.'.join(environ.get('CUDA_VER', '10.0').split('.')[:2]) %} -{% set py_version = environ.get('CONDA_PY', 36) %} - -### -# Versions referenced below are set in `conda/recipe/*versions.yaml` except for -# those set above (e.g. `cuda_version`) -# -# gpuCI loads the correct file based on the build type (NIGHTLY or RELEASE) in -# `ci/cpu/build-meta.sh` and `ci/axis/*.yaml` -# -# Manual builds need to use the `conda build` flag of `-m .yaml` -# to set these versions -### - -package: - name: rapids-blazing - version: {{ rapids_version }} - -source: - path: ../../.. - -build: - number: {{ GIT_DESCRIBE_NUMBER }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} - script_env: - - CUDA_VERSION - - RAPIDS_VER - - VERSION_SUFFIX - -requirements: - host: - - python - run: - - cudatoolkit ={{ cuda_version }}.* - - rapids ={{ minor_version }}.* - - blazingsql ={{ minor_version }}.* - -test: - requires: - - cudatoolkit {{ cuda_version }}.* - imports: - - cio - - cudf - - dask_cudf - - cuml - - cugraph - - cuspatial - -about: - home: http://rapids.ai/ - license: Custom - license_file: conda/recipes/rapids/LICENSE - summary: 'RAPIDS Suite - Open GPU Data Science' - description: | - Meta-package for the RAPIDS suite of software libraries. RAPIDS gives you the freedom to execute end-to-end data science - and analytics pipelines entirely on GPUs. It relies on NVIDIA® CUDA® primitives for low-level compute optimization, - but exposes that GPU parallelism and high-bandwidth memory speed through user-friendly Python interfaces. - doc_url: https://docs.rapids.ai/ - dev_url: https://github.com/rapidsai/ From 03fef10f6c85b8ca3cfeef510abeb577450dfe2d Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Thu, 21 Oct 2021 11:35:32 -0700 Subject: [PATCH 07/19] update xgboost version --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 2210866e..60ef63bf 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -9,7 +9,7 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: # Minor version is appended in meta.yaml - - '=1.4.2dev.rapidsai' + - '=1.5.0dev.rapidsai' # Versions for conda conda_version: From 1539c613ddccdccbb46dd7559c27c7fb26cd6b97 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 25 Oct 2021 13:57:04 -0400 Subject: [PATCH 08/19] update RAPIDS_VER to 21.12 --- ci/axis/release-arm64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 1f077811..a73e7575 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -6,7 +6,7 @@ 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: From 6c84aadfa793659d1d3f618bb8fcfbc6e7e066aa Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 25 Oct 2021 14:11:09 -0400 Subject: [PATCH 09/19] add arm files to update-release.sh & fix sed commands --- ci/release/update-version.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index b2ad1fb1..62dcd3e6 100755 --- a/ci/release/update-version.sh +++ b/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 From 0755e3777b1a8f6124e4bc6a81901c8169a4dd81 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 25 Oct 2021 14:12:02 -0400 Subject: [PATCH 10/19] add 11.5 to axes --- ci/axis/nightly-arm64.yaml | 1 + ci/axis/nightly.yaml | 1 + ci/axis/release-arm64.yaml | 1 + ci/axis/release.yaml | 1 + ci/axis/tests.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml index 79f8ea9b..7539cf0e 100644 --- a/ci/axis/nightly-arm64.yaml +++ b/ci/axis/nightly-arm64.yaml @@ -10,6 +10,7 @@ RAPIDS_VER: # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: + - 11.5 - 11.4 - 11.2 diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index ea905ed6..eb8daccf 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -10,6 +10,7 @@ RAPIDS_VER: # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: + - 11.5 - 11.4 - 11.2 - 11.0 diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index a73e7575..11290c47 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -10,6 +10,7 @@ RAPIDS_VER: # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: + - 11.5 - 11.4 - 11.2 diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 1def2479..a7eb192d 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -10,6 +10,7 @@ RAPIDS_VER: # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: + - 11.5 - 11.4 - 11.2 - 11.0 diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index a0a343f4..d44fe810 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -9,6 +9,7 @@ RAPIDS_VER: - "21.12" CUDA_VER: + - 11.5 - 11.4 - 11.2 - 11.0 From a3b5f093173826424c1928a0989c83222985f369 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Tue, 26 Oct 2021 17:58:25 +0200 Subject: [PATCH 11/19] Unpin setuptools version Signed-off-by: Jordan Jacobelli --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 2210866e..fdc9d224 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -149,7 +149,7 @@ scikit_learn_version: scipy_version: - '=1.6.0' setuptools_version: - - '>=49,<50' + - '>50' spdlog_version: - '>=1.8.5,<1.9' sphinx_markdown_tables_version: From eda82da47353c67308e113ba48ef1b519c99fa57 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 3 Nov 2021 09:21:56 -0500 Subject: [PATCH 12/19] change minimum s3fs version --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index fdc9d224..b6bfdcb5 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -141,7 +141,7 @@ pytest_asyncio_version: rapidjson_version: - '=1.1.0' s3fs_version: - - '>=0.5.2' + - '>=2021.08.0' scikit_image_version: - '>=0.18.0,<0.19.0' scikit_learn_version: From 91fcdf519db65785a06b8acc1ca07a62254533f4 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 8 Nov 2021 21:48:12 -0600 Subject: [PATCH 13/19] change minimum pin of cupy --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 55112262..1f667bc0 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -43,7 +43,7 @@ cmake_format_version: cmake_setuptools_version: - '>=0.1.3' cupy_version: - - '>=8.5.0,<10.0.0a0' + - '>=9.5.0,<10.0.0a0' cython_version: - '>=0.29.17,<0.30' dask_version: From 9fffe869e2a8e5c995a024f102ce7d373e364daa Mon Sep 17 00:00:00 2001 From: Ashwin Srinath Date: Mon, 15 Nov 2021 12:50:03 -0500 Subject: [PATCH 14/19] Add ptxcompiler to runtime env --- conda/recipes/rapids/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index c0a5927c..c2f8bed2 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -56,6 +56,7 @@ requirements: - dask-cuda ={{ minor_version }}.* - rapids-xgboost ={{ minor_version }}.* - rmm ={{ minor_version }}.* + - ptxcompiler # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler test: # [linux64] imports: # [linux64] From 9b0062ea6491ca63a779a009568718d101cd4f08 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 17 Nov 2021 09:26:43 -0600 Subject: [PATCH 15/19] Upgrade clang to `11.1.0` --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 55112262..949cbc81 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -35,7 +35,7 @@ bokeh_version: boost_cpp_version: - '=1.72.0' clang_version: - - '=11.0.0' + - '=11.1.0' cmake_version: - '>=3.20.1,<3.21' cmake_format_version: From 98c6ee25da2b3ebf5ad53f44f7641b2f6d82c524 Mon Sep 17 00:00:00 2001 From: Ashwin Srinath <3190405+shwina@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:24:48 -0500 Subject: [PATCH 16/19] Update conda/recipes/rapids/meta.yaml Co-authored-by: jakirkham --- conda/recipes/rapids/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index c2f8bed2..fe2c439c 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -56,7 +56,7 @@ requirements: - dask-cuda ={{ minor_version }}.* - rapids-xgboost ={{ minor_version }}.* - rmm ={{ minor_version }}.* - - ptxcompiler # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler + - ptxcompiler # [linux64] # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler test: # [linux64] imports: # [linux64] From 621f1b53542af36709ce4949ff9b650f2db857ec Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 19 Nov 2021 10:00:48 -0500 Subject: [PATCH 17/19] Add `mock` package to `rapids-build-env` This PR adds the `mock` package to `rapids-build-env`. `mock` used to be included by the `moto` package, but the `moto` package was recently upgraded and removed its dependency on `mock` which caused some issues for `cuxfilter`, so we need to include it explicitly. --- conda/recipes/rapids-build-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 89bb2adc..9d1068de 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/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 }} From b1d6a21859ae6b6a220b97be87cb9d3a58b6d93c Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 19 Nov 2021 10:25:22 -0600 Subject: [PATCH 18/19] pin max dask & distributed versions --- conda/recipes/versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 86400ece..98417890 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -47,11 +47,11 @@ cupy_version: cython_version: - '>=0.29.17,<0.30' dask_version: - - '>=2021.9.1' + - '>=2021.9.1,<=2021.11.2' datashader_version: - '>=0.11.1,<0.12' distributed_version: - - '>=2021.9.1' + - '>=2021.9.1,<=2021.11.2' dlpack_version: - '>=0.5,<0.6.0a0' double_conversion_version: From 54e556e9fc62f062847da8a63ad84afe376baea8 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 19 Nov 2021 18:00:00 -0600 Subject: [PATCH 19/19] Apply suggestions from code review Co-authored-by: jakirkham --- conda/recipes/versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 98417890..4c8cbe1c 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -47,11 +47,11 @@ cupy_version: cython_version: - '>=0.29.17,<0.30' dask_version: - - '>=2021.9.1,<=2021.11.2' + - '>=2021.11.1,<=2021.11.2' datashader_version: - '>=0.11.1,<0.12' distributed_version: - - '>=2021.9.1,<=2021.11.2' + - '>=2021.11.1,<=2021.11.2' dlpack_version: - '>=0.5,<0.6.0a0' double_conversion_version: