diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml index 76224301..7539cf0e 100644 --- a/ci/axis/nightly-arm64.yaml +++ b/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 diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index e3913ca2..eb8daccf 100644 --- a/ci/axis/nightly.yaml +++ b/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 diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 1f077811..11290c47 100644 --- a/ci/axis/release-arm64.yaml +++ b/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 diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 729c97d8..a7eb192d 100644 --- a/ci/axis/release.yaml +++ b/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 diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 06927e49..d44fe810 100644 --- a/ci/axis/tests.yaml +++ b/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 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/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 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/ diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index b5fadf0d..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 }} @@ -109,6 +110,7 @@ requirements: - panel {{ panel_version }} - pickle5 # [py<38] - pkg-config + - pre-commit - protobuf {{ protobuf_version }} - psutil - pyarrow {{ arrow_version }} diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index c0a5927c..fe2c439c 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 # [linux64] # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler test: # [linux64] imports: # [linux64] diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 8d2a8652..4c8cbe1c 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: @@ -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: @@ -43,15 +43,15 @@ 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: - - '=2021.9.1' + - '>=2021.11.1,<=2021.11.2' datashader_version: - '>=0.11.1,<0.12' distributed_version: - - '=2021.9.1' + - '>=2021.11.1,<=2021.11.2' dlpack_version: - '>=0.5,<0.6.0a0' double_conversion_version: @@ -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: @@ -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: