From 5bb80e57c21467e0b26e386b5c90d54da590869f Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 20:43:11 -0500 Subject: [PATCH 001/113] ENH Add nightly axis file --- ci/axis/nightly.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ci/axis/nightly.yml diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml new file mode 100644 index 00000000..8e9bb342 --- /dev/null +++ b/ci/axis/nightly.yml @@ -0,0 +1,20 @@ +CONDA_USERNAME: + - rapidsai-nightly + +RAPIDS_VERSION: + - 0.13.0 + +XGBOOST_VERSION: + - 1.0.0dev.rapidsai0.13 + +CUDA_VERSION: + - 10.2 + - 10.1 + - 10.0 + +DEFAULT_CUDA_VERSION: + - 10.0 + +PYTHON_VERSION: + - 3.6 + - 3.7 From b9114bede938626e63aad77e9e823f3631dd9d7b Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 20:43:44 -0500 Subject: [PATCH 002/113] ENH Add release axis file --- ci/axis/release.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ci/axis/release.yml diff --git a/ci/axis/release.yml b/ci/axis/release.yml new file mode 100644 index 00000000..23fd95cf --- /dev/null +++ b/ci/axis/release.yml @@ -0,0 +1,20 @@ +CONDA_USERNAME: + - rapidsai + +RAPIDS_VERSION: + - 0.13.0 + +XGBOOST_VERSION: + - 1.0.0dev.rapidsai0.13 + +CUDA_VERSION: + - 10.2 + - 10.1 + - 10.0 + +DEFAULT_CUDA_VERSION: + - 10.0 + +PYTHON_VERSION: + - 3.6 + - 3.7 From ee629454a8f7f2f1e246d6bda3166418a3bbbc48 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 20:55:54 -0500 Subject: [PATCH 003/113] ENH Add build script for rapids-xgboost pkg --- ci/cpu/build-rapids-xgboost.sh | 53 ++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 ci/cpu/build-rapids-xgboost.sh diff --git a/ci/cpu/build-rapids-xgboost.sh b/ci/cpu/build-rapids-xgboost.sh new file mode 100644 index 00000000..cc02bf40 --- /dev/null +++ b/ci/cpu/build-rapids-xgboost.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# Copyright (c) 2020, NVIDIA CORPORATION. +######################################################## +# rapids-xgboost meta pkg conda build script for gpuCI # +######################################################## +set -ex + +# Set paths +export PATH=/opt/conda/bin:$PATH +export HOME=$WORKSPACE + +# Activate base conda env +source activate base + +# Print current env vars +env + +# Install gpuCI tools +curl -s https://raw.githubusercontent.com/rapidsai/gpuci-tools/master/install.sh | bash +source ~/.bashrc +cd ~ + +# Fetch pkgs for upload +gpuci_logger "Install anaconda-client..." +conda install -y anaconda-client + +# Print diagnostic information +gpuci_logger "Print conda info..." +conda info +conda config --show-sources +conda list --show-channel-urls + +# Build pkg +gpuci_logger "Start conda build..." +conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost + +# Get output location +gpuci_logger "Get conda build output..." +export UPLOADFILE=`conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost --output` +test -e ${UPLOADFILE} + +gpuci_logger "Setting conda label.." +LABEL_OPTION="--label main" +echo "LABEL_OPTION=${LABEL_OPTION}" + +if [ -z "$MY_UPLOAD_KEY" ]; then + gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." + return 0 +fi + +gpuci_logger "Upload starting..." +echo ${UPLOADFILE} +anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} ${LABEL_OPTION} --force ${UPLOADFILE} From a5da6f28f9c43c30d79e311479c66acd88ce0a79 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 20:57:13 -0500 Subject: [PATCH 004/113] ENH Add build script for rapids pkg --- ci/cpu/build-rapids.sh | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 ci/cpu/build-rapids.sh diff --git a/ci/cpu/build-rapids.sh b/ci/cpu/build-rapids.sh new file mode 100644 index 00000000..554663eb --- /dev/null +++ b/ci/cpu/build-rapids.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# Copyright (c) 2020, NVIDIA CORPORATION. +################################################ +# rapids meta pkg conda build script for gpuCI # +################################################ +set -ex + +# Set paths +export PATH=/opt/conda/bin:$PATH +export HOME=$WORKSPACE + +# Activate base conda env +source activate base + +# Print current env vars +env + +# Install gpuCI tools +curl -s https://raw.githubusercontent.com/rapidsai/gpuci-tools/master/install.sh | bash +source ~/.bashrc +cd ~ + +# Fetch pkgs for upload +gpuci_logger "Install anaconda-client..." +conda install -y anaconda-client + +# Print diagnostic information +gpuci_logger "Print conda info..." +conda info +conda config --show-sources +conda list --show-channel-urls + +# Build pkg +gpuci_logger "Start conda build..." +conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids + +# Get output location +gpuci_logger "Get conda build output..." +export UPLOADFILE=`conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids --output` +test -e ${UPLOADFILE} + +gpuci_logger "Setting conda label.." +LABEL_OPTION="--label main" +echo "LABEL_OPTION=${LABEL_OPTION}" + +if [ -z "$MY_UPLOAD_KEY" ]; then + gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." + return 0 +fi + +gpuci_logger "Upload starting..." +echo ${UPLOADFILE} +anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} ${LABEL_OPTION} --force ${UPLOADFILE} From 339597dd89c1b7a0386e2ec8fae44c16905d4204 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 20:59:39 -0500 Subject: [PATCH 005/113] FIX Update channels to match axis config --- ci/cpu/build-rapids.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/cpu/build-rapids.sh b/ci/cpu/build-rapids.sh index 554663eb..495632e1 100644 --- a/ci/cpu/build-rapids.sh +++ b/ci/cpu/build-rapids.sh @@ -32,11 +32,11 @@ conda list --show-channel-urls # Build pkg gpuci_logger "Start conda build..." -conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids +conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids # Get output location gpuci_logger "Get conda build output..." -export UPLOADFILE=`conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids --output` +export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids --output` test -e ${UPLOADFILE} gpuci_logger "Setting conda label.." From c470401be2367a486fb4524a044c72dbb63f87f7 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:00:15 -0500 Subject: [PATCH 006/113] FIX Update channels to match axis config --- ci/cpu/build-rapids-xgboost.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/cpu/build-rapids-xgboost.sh b/ci/cpu/build-rapids-xgboost.sh index cc02bf40..949bffb8 100644 --- a/ci/cpu/build-rapids-xgboost.sh +++ b/ci/cpu/build-rapids-xgboost.sh @@ -32,11 +32,11 @@ conda list --show-channel-urls # Build pkg gpuci_logger "Start conda build..." -conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost +conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost # Get output location gpuci_logger "Get conda build output..." -export UPLOADFILE=`conda build -c rapidsai-nightly -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost --output` +export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost --output` test -e ${UPLOADFILE} gpuci_logger "Setting conda label.." From 8261540a3922563e9583a72707b7a970c147a315 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:09:28 -0500 Subject: [PATCH 007/113] ENH Incorporate default builds in the same build --- ci/cpu/build-rapids-xgboost.sh | 56 ++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/ci/cpu/build-rapids-xgboost.sh b/ci/cpu/build-rapids-xgboost.sh index 949bffb8..3eb08dfb 100644 --- a/ci/cpu/build-rapids-xgboost.sh +++ b/ci/cpu/build-rapids-xgboost.sh @@ -30,24 +30,40 @@ conda info conda config --show-sources conda list --show-channel-urls -# Build pkg -gpuci_logger "Start conda build..." -conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost - -# Get output location -gpuci_logger "Get conda build output..." -export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost --output` -test -e ${UPLOADFILE} - -gpuci_logger "Setting conda label.." -LABEL_OPTION="--label main" -echo "LABEL_OPTION=${LABEL_OPTION}" - -if [ -z "$MY_UPLOAD_KEY" ]; then - gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." - return 0 -fi +function build_pkg { + # Build pkg + gpuci_logger "Start conda build..." + conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost + + # Get output location + gpuci_logger "Get conda build output..." + export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost --output` + test -e ${UPLOADFILE} + + # Check for upload key + if [ -z "$MY_UPLOAD_KEY" ]; then + gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." + return 0 + fi -gpuci_logger "Upload starting..." -echo ${UPLOADFILE} -anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} ${LABEL_OPTION} --force ${UPLOADFILE} + # Upload + gpuci_logger "Upload starting..." + echo ${UPLOADFILE} + anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --force ${UPLOADFILE} + + # Remove build + gpuci_logger "Clean up build cache..." + conda build purge +} + +# Start build +build_pkg + +# Build default version if current version matches DEFAULT_CUDA_VERSION +if [ "$CUDA_VESION" == "$DEFAULT_CUDA_VERSION" ] ; then + gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." + gpuci_logger "Previous build number '$RAPIDS_OFFSET'" + export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) + gpuci_logger "New build number '$RAPIDS_OFFSET'" + build_pkg +fi From e732a35646004971b81bdb4e67c5b14ce4b72a55 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:12:41 -0500 Subject: [PATCH 008/113] ENH Create a consolidated build file for both meta pkgs --- ci/cpu/build.sh | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 ci/cpu/build.sh diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh new file mode 100644 index 00000000..f228a644 --- /dev/null +++ b/ci/cpu/build.sh @@ -0,0 +1,72 @@ +#!/bin/bash +# Copyright (c) 2020, NVIDIA CORPORATION. +############################################################### +# rapids/rapids-xgboost meta pkg conda build script for gpuCI # +# # +# config set in `ci/axis/*.yml` # +############################################################### +set -ex + +# Set paths +export PATH=/opt/conda/bin:$PATH +export HOME=$WORKSPACE + +# Activate base conda env +source activate base + +# Print current env vars +env + +# Install gpuCI tools +curl -s https://raw.githubusercontent.com/rapidsai/gpuci-tools/master/install.sh | bash +source ~/.bashrc +cd ~ + +# Fetch pkgs for upload +gpuci_logger "Install anaconda-client..." +conda install -y anaconda-client + + +# Print diagnostic information +gpuci_logger "Print conda info..." +conda info +conda config --show-sources +conda list --show-channel-urls + +function build_pkg { + # Build pkg + gpuci_logger "Start conda build for '$CONDA_RECIPE'..." + conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${CONDA_RECIPE) + + # Get output location + gpuci_logger "Get conda build output..." + export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${CONDA_RECIPE) --output` + test -e ${UPLOADFILE} + + # Check for upload key + if [ -z "$MY_UPLOAD_KEY" ]; then + gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." + return 0 + fi + + # Upload + gpuci_logger "Upload starting..." + echo ${UPLOADFILE} + anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --force ${UPLOADFILE} + + # Remove build + gpuci_logger "Clean up build cache..." + conda build purge +} + +# Start build +build_pkg + +# Build default version if current version matches DEFAULT_CUDA_VERSION +if [ "$CUDA_VESION" == "$DEFAULT_CUDA_VERSION" ] ; then + gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." + gpuci_logger "Previous build number '$RAPIDS_OFFSET'" + export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) + gpuci_logger "New build number '$RAPIDS_OFFSET'" + build_pkg +fi From e3232aaa37bb4384e262d9356591bbec0a6e0e55 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:13:02 -0500 Subject: [PATCH 009/113] ENH Remove old build files --- ci/cpu/build-rapids.sh | 53 ------------------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 ci/cpu/build-rapids.sh diff --git a/ci/cpu/build-rapids.sh b/ci/cpu/build-rapids.sh deleted file mode 100644 index 495632e1..00000000 --- a/ci/cpu/build-rapids.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. -################################################ -# rapids meta pkg conda build script for gpuCI # -################################################ -set -ex - -# Set paths -export PATH=/opt/conda/bin:$PATH -export HOME=$WORKSPACE - -# Activate base conda env -source activate base - -# Print current env vars -env - -# Install gpuCI tools -curl -s https://raw.githubusercontent.com/rapidsai/gpuci-tools/master/install.sh | bash -source ~/.bashrc -cd ~ - -# Fetch pkgs for upload -gpuci_logger "Install anaconda-client..." -conda install -y anaconda-client - -# Print diagnostic information -gpuci_logger "Print conda info..." -conda info -conda config --show-sources -conda list --show-channel-urls - -# Build pkg -gpuci_logger "Start conda build..." -conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids - -# Get output location -gpuci_logger "Get conda build output..." -export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids --output` -test -e ${UPLOADFILE} - -gpuci_logger "Setting conda label.." -LABEL_OPTION="--label main" -echo "LABEL_OPTION=${LABEL_OPTION}" - -if [ -z "$MY_UPLOAD_KEY" ]; then - gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." - return 0 -fi - -gpuci_logger "Upload starting..." -echo ${UPLOADFILE} -anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} ${LABEL_OPTION} --force ${UPLOADFILE} From 349e754bc6df894586becd69c82761bdddfe4635 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:13:10 -0500 Subject: [PATCH 010/113] ENH Remove old build files --- ci/cpu/build-rapids-xgboost.sh | 69 ---------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 ci/cpu/build-rapids-xgboost.sh diff --git a/ci/cpu/build-rapids-xgboost.sh b/ci/cpu/build-rapids-xgboost.sh deleted file mode 100644 index 3eb08dfb..00000000 --- a/ci/cpu/build-rapids-xgboost.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. -######################################################## -# rapids-xgboost meta pkg conda build script for gpuCI # -######################################################## -set -ex - -# Set paths -export PATH=/opt/conda/bin:$PATH -export HOME=$WORKSPACE - -# Activate base conda env -source activate base - -# Print current env vars -env - -# Install gpuCI tools -curl -s https://raw.githubusercontent.com/rapidsai/gpuci-tools/master/install.sh | bash -source ~/.bashrc -cd ~ - -# Fetch pkgs for upload -gpuci_logger "Install anaconda-client..." -conda install -y anaconda-client - -# Print diagnostic information -gpuci_logger "Print conda info..." -conda info -conda config --show-sources -conda list --show-channel-urls - -function build_pkg { - # Build pkg - gpuci_logger "Start conda build..." - conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost - - # Get output location - gpuci_logger "Get conda build output..." - export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} conda/recipes/rapids-xgboost --output` - test -e ${UPLOADFILE} - - # Check for upload key - if [ -z "$MY_UPLOAD_KEY" ]; then - gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." - return 0 - fi - - # Upload - gpuci_logger "Upload starting..." - echo ${UPLOADFILE} - anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --force ${UPLOADFILE} - - # Remove build - gpuci_logger "Clean up build cache..." - conda build purge -} - -# Start build -build_pkg - -# Build default version if current version matches DEFAULT_CUDA_VERSION -if [ "$CUDA_VESION" == "$DEFAULT_CUDA_VERSION" ] ; then - gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." - gpuci_logger "Previous build number '$RAPIDS_OFFSET'" - export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) - gpuci_logger "New build number '$RAPIDS_OFFSET'" - build_pkg -fi From 5dd8444873e1d6c1b5406872ea567a652b9172e3 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:15:37 -0500 Subject: [PATCH 011/113] ENH Add conda recipes to config --- ci/axis/nightly.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 8e9bb342..50457d0f 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -1,6 +1,13 @@ CONDA_USERNAME: - rapidsai-nightly +# Note that gpuCI builds `rapids-xgboost first as it is needed by `rapids` +CONDA_XGBOOST_RECIPE: + - conda/recipe/rapids-xgboost + +CONDA_RAPIDS_RECIPE + - conda/recipe/rapids + RAPIDS_VERSION: - 0.13.0 From b42769c7a665ff01e72d1525a8c5806acd4abea7 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:16:12 -0500 Subject: [PATCH 012/113] ENH Add conda recipes to config --- ci/axis/release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/axis/release.yml b/ci/axis/release.yml index 23fd95cf..a0319e66 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -1,6 +1,13 @@ CONDA_USERNAME: - rapidsai +# Note that gpuCI builds `rapids-xgboost first as it is needed by `rapids` +CONDA_XGBOOST_RECIPE: + - conda/recipe/rapids-xgboost + +CONDA_RAPIDS_RECIPE: + - conda/recipe/rapids + RAPIDS_VERSION: - 0.13.0 From ce1bd5b5027065fdb375edd485eb7588160f3b38 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:16:41 -0500 Subject: [PATCH 013/113] FIX Correct yaml typo --- ci/axis/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 50457d0f..b39951df 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -5,7 +5,7 @@ CONDA_USERNAME: CONDA_XGBOOST_RECIPE: - conda/recipe/rapids-xgboost -CONDA_RAPIDS_RECIPE +CONDA_RAPIDS_RECIPE: - conda/recipe/rapids RAPIDS_VERSION: From c6b3d3b065f2adf4d028b780a26d3b4253e75ab2 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:19:38 -0500 Subject: [PATCH 014/113] ENH Change script to build all meta pkgs in one job --- ci/cpu/build.sh | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index f228a644..ee795913 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -36,11 +36,11 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '$CONDA_RECIPE'..." - conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${CONDA_RECIPE) + conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1) # Get output location gpuci_logger "Get conda build output..." - export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${CONDA_RECIPE) --output` + export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1) --output` test -e ${UPLOADFILE} # Check for upload key @@ -59,14 +59,21 @@ function build_pkg { conda build purge } -# Start build -build_pkg +function build_default_pkg { + # Build default version if current version matches DEFAULT_CUDA_VERSION + if [ "$CUDA_VESION" == "$DEFAULT_CUDA_VERSION" ] ; then + gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." + gpuci_logger "Previous build number '$RAPIDS_OFFSET'" + export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) + gpuci_logger "New build number '$RAPIDS_OFFSET'" + build_pkg $1 + else + gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is not DEFAULT_CUDA_VERSION, skipping default build..." + fi +} -# Build default version if current version matches DEFAULT_CUDA_VERSION -if [ "$CUDA_VESION" == "$DEFAULT_CUDA_VERSION" ] ; then - gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." - gpuci_logger "Previous build number '$RAPIDS_OFFSET'" - export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) - gpuci_logger "New build number '$RAPIDS_OFFSET'" - build_pkg -fi +# Run builds +build_pkg $CONDA_XGBOOST_RECIPE +build_default_pkg $CONDA_XGBOOST_RECIPE +build_pkg $CONDA_RAPIDS_RECIPE +build_default_pkg $CONDA_RAPIDS_RECIPE From dbc60b82c52fd8cd9da502f4a7db9ef97a9c8ab0 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:28:36 -0500 Subject: [PATCH 015/113] FIX Activate correct conda env --- ci/cpu/build.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index ee795913..b02ef9e7 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -11,8 +11,8 @@ set -ex export PATH=/opt/conda/bin:$PATH export HOME=$WORKSPACE -# Activate base conda env -source activate base +# Activate conda env +source activate gdf # Print current env vars env @@ -22,11 +22,6 @@ curl -s https://raw.githubusercontent.com/rapidsai/gpuci-tools/master/install.sh source ~/.bashrc cd ~ -# Fetch pkgs for upload -gpuci_logger "Install anaconda-client..." -conda install -y anaconda-client - - # Print diagnostic information gpuci_logger "Print conda info..." conda info From 9e8dd4ede987665a59a232f0ee37a95626dccd4d Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:30:53 -0500 Subject: [PATCH 016/113] FIX Correct conda path --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index b02ef9e7..a6aab71a 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -8,7 +8,7 @@ set -ex # Set paths -export PATH=/opt/conda/bin:$PATH +export PATH=/conda/bin:$PATH export HOME=$WORKSPACE # Activate conda env From 4a662b11bce2abd2e0a9112574041a91179324bd Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 11 Feb 2020 21:43:31 -0500 Subject: [PATCH 017/113] FIX Correct env var syntax --- ci/cpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index a6aab71a..e62e0bd7 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -31,11 +31,11 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '$CONDA_RECIPE'..." - conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1) + conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1} # Get output location gpuci_logger "Get conda build output..." - export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1) --output` + export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1} --output` test -e ${UPLOADFILE} # Check for upload key From f3acfa81697aeaa9067797e9b149693ee167972e Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 00:00:16 -0500 Subject: [PATCH 018/113] FIX Update logger to use argument --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index e62e0bd7..b26c03eb 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -30,7 +30,7 @@ conda list --show-channel-urls function build_pkg { # Build pkg - gpuci_logger "Start conda build for '$CONDA_RECIPE'..." + gpuci_logger "Start conda build for '${1}'..." conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1} # Get output location From 930f6934db6226ad986aca60ade96247c2cec77f Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 00:02:25 -0500 Subject: [PATCH 019/113] FIX Correct conda recipe paths --- ci/axis/nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index b39951df..37b55be9 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -3,10 +3,10 @@ CONDA_USERNAME: # Note that gpuCI builds `rapids-xgboost first as it is needed by `rapids` CONDA_XGBOOST_RECIPE: - - conda/recipe/rapids-xgboost + - conda/recipes/rapids-xgboost CONDA_RAPIDS_RECIPE: - - conda/recipe/rapids + - conda/recipes/rapids RAPIDS_VERSION: - 0.13.0 From 2c024e04284b4e940e65ab24d8516cbed744e424 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 00:02:38 -0500 Subject: [PATCH 020/113] FIX Correct conda recipe paths --- ci/axis/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/axis/release.yml b/ci/axis/release.yml index a0319e66..49903689 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -3,10 +3,10 @@ CONDA_USERNAME: # Note that gpuCI builds `rapids-xgboost first as it is needed by `rapids` CONDA_XGBOOST_RECIPE: - - conda/recipe/rapids-xgboost + - conda/recipes/rapids-xgboost CONDA_RAPIDS_RECIPE: - - conda/recipe/rapids + - conda/recipes/rapids RAPIDS_VERSION: - 0.13.0 From 3b65c131aacb7d6c309b093aa9b0ea7888f18fff Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 01:04:57 -0500 Subject: [PATCH 021/113] FIX Update nccl version for CUDA 10.2 support --- conda/recipes/rapids-xgboost/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 3f82f654..cce2c7ed 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -28,7 +28,7 @@ requirements: - python run: - cudatoolkit ={{ cuda_version }}.* - - nccl =2.4.* + - nccl =2.5.* - python - xgboost ={{ xgb_version }} From b9e7e2b975497fd60e59648d953650ff2a477a93 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 01:06:08 -0500 Subject: [PATCH 022/113] FIX Update nccl version for CUDA 10.2 support --- 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 00158d76..46e6d0bc 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -31,7 +31,7 @@ requirements: - python run: - cudatoolkit ={{ cuda_version }}.* - - nccl =2.4.* + - nccl =2.5.* - numba ={{ numba_version }}.* - numpy>={{ numpy_version }}.* - python From aada33292cff158e593c8c4383aebbbfa4a4dd4e Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 01:08:41 -0500 Subject: [PATCH 023/113] FIX Add missing dask-xgboost, numba, numpy versions --- ci/axis/nightly.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 37b55be9..e4e77534 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -11,9 +11,18 @@ CONDA_RAPIDS_RECIPE: RAPIDS_VERSION: - 0.13.0 +DASK_XGBOOST_VERSION: + - 0.2.0.dev28 + XGBOOST_VERSION: - 1.0.0dev.rapidsai0.13 +NUMBA_VERSION: + - 0.46.0 + +NUMPY_VERSION: + - 1.17.3 + CUDA_VERSION: - 10.2 - 10.1 From 1ea9f5f8f46efbc0f09568bc5e6fca5b7c679903 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 12 Feb 2020 01:09:11 -0500 Subject: [PATCH 024/113] FIX Add missing dask-xgboost, numba, numpy versions --- ci/axis/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/axis/release.yml b/ci/axis/release.yml index 49903689..89676b0d 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -11,9 +11,18 @@ CONDA_RAPIDS_RECIPE: RAPIDS_VERSION: - 0.13.0 +DASK_XGBOOST_VERSION: + - 0.2.0.dev28 + XGBOOST_VERSION: - 1.0.0dev.rapidsai0.13 +NUMBA_VERSION: + - 0.46.0 + +NUMPY_VERSION: + - 1.17.3 + CUDA_VERSION: - 10.2 - 10.1 From 464aabaaebd7a409c05fc4380c0aa7afabb6d35e Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 13 Feb 2020 22:21:11 -0500 Subject: [PATCH 025/113] FIX Correct env var name in if statement --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index b26c03eb..b0358cea 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -56,7 +56,7 @@ function build_pkg { function build_default_pkg { # Build default version if current version matches DEFAULT_CUDA_VERSION - if [ "$CUDA_VESION" == "$DEFAULT_CUDA_VERSION" ] ; then + if [ "$CUDA_VERSION" == "$DEFAULT_CUDA_VERSION" ] ; then gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." gpuci_logger "Previous build number '$RAPIDS_OFFSET'" export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) From baa1356331a05e1c9404343cc5f68b030a74d9eb Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 13 Feb 2020 22:26:29 -0500 Subject: [PATCH 026/113] FIX Reset offset after default build --- ci/cpu/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index b0358cea..042c387d 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -11,6 +11,9 @@ set -ex export PATH=/conda/bin:$PATH export HOME=$WORKSPACE +# Save original build offset +export ORIG_OFFSET=$RAPIDS_OFFSET + # Activate conda env source activate gdf @@ -62,6 +65,9 @@ function build_default_pkg { export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) gpuci_logger "New build number '$RAPIDS_OFFSET'" build_pkg $1 + # Reset offset + export RAPIDS_OFFSET=$ORIG_OFFSET + gpuci_logger "Reset build number after default build '$RAPIDS_OFFSET'" else gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is not DEFAULT_CUDA_VERSION, skipping default build..." fi From dc6a1fc305a076521505dcadfb589a6b22bb62da Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 13 Feb 2020 22:30:28 -0500 Subject: [PATCH 027/113] FIX Remove debug output --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 042c387d..4cca6050 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -5,7 +5,7 @@ # # # config set in `ci/axis/*.yml` # ############################################################### -set -ex +set -e # Set paths export PATH=/conda/bin:$PATH From c91bcc5cce4893abe57cabf3d0f0b43116522947 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 00:51:46 -0500 Subject: [PATCH 028/113] ENH Add cupy restriction --- 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 46e6d0bc..2e0b3e2e 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -31,6 +31,7 @@ requirements: - python run: - cudatoolkit ={{ cuda_version }}.* + - cupy>=6.6.0,<7 - nccl =2.5.* - numba ={{ numba_version }}.* - numpy>={{ numpy_version }}.* From f1bc127209704f17d02cf07086d01568ecc7d7af Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 01:30:05 -0500 Subject: [PATCH 029/113] ENH New build meta pkg --- conda/recipes/rapids-build/meta.yaml | 91 ++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 conda/recipes/rapids-build/meta.yaml diff --git a/conda/recipes/rapids-build/meta.yaml b/conda/recipes/rapids-build/meta.yaml new file mode 100644 index 00000000..9a14f5d8 --- /dev/null +++ b/conda/recipes/rapids-build/meta.yaml @@ -0,0 +1,91 @@ +# Copyright (c) 2020, NVIDIA CORPORATION. + +{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} +{% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set py_version = environ.get('CONDA_PY', 36) %} + +package: + name: rapids-build-env + version: {{ version }} + +source: + path: . + +build: + number: {{ build_offset }} + string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} + script_env: + - RAPIDS_VERSION + - RAPIDS_OFFSET + - CUDA_VERSION + +requirements: + host: + - python + run: + - arrow-cpp =0.15.0 + - black + - conda-forge::blas=2.14=openblas + - boost-cpp =1.70.0 + - boto3 + - cmake =3.14.5 + - cmake_setuptools >=0.1.3 + - conda =4.7.12 + - conda-build =3.18.11 + - conda-verify =3.1.1 + - cudatoolkit ={{ cuda_version }}.* + - cupy >=6.6.0,<8.0.0a0,!=7.1.0 + - cython >=0.29,<0.30 + - dask >=2.1.0 + - distributed >=2.1.0 + - dlpack =0.2 + - double-conversion =3.1.5 + - fastavro =0.22.3 + - flake8 + - flatbuffers =1.10.0 + - gcsfs + - gdal =2.4.* + - git + - graphviz + - httpretty + - hypothesis + - isort + - lapack + - rapidsai::libclang =8.0.0 + - libcypher-parser + - libgcc-ng =7.3.0 + - libgfortran-ng =7.3.0 + - liblapack + - librdkafka =1.2.2 + - libstdcxx-ng =7.3.0 + - make + - moto + - nccl =2.5.* + - numba >=0.46,<0.47 + - numpy >=1.17.3.* + - pandas >=0.25,<0.26 + - protobuf >=3.4.1,<4.0.0 + - pyarrow =0.15.0 + - pytest + - pytest-cov + - python + - rapidjson =1.1.0 + - ripgrep + - s3fs + - setuptools + - scikit-learn =0.21.3 + - scipy =1.3.0 + - streamz + - twine + +about: + home: http://rapids.ai/ + license: Apache-2.0 + license_file: LICENSE + summary: 'RAPIDS Build Dependencies and Tool Environment Installer' + description: | + Meta-package for installing build dependencies and tools needed to build all RAPIDS libraries. + doc_url: https://docs.rapids.ai/ + dev_url: https://github.com/rapidsai/ From 173bebe021b32917a0db628c52918690d4dbec04 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 01:31:58 -0500 Subject: [PATCH 030/113] ENH Add rapids build meta pkg to axis --- ci/axis/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index e4e77534..747b8dc4 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -8,6 +8,9 @@ CONDA_XGBOOST_RECIPE: CONDA_RAPIDS_RECIPE: - conda/recipes/rapids +CONDA_RAPIDS_BUILD_RECIPE: + - conda/recipes/rapids-build-env + RAPIDS_VERSION: - 0.13.0 From 97c80c6490517a62612a9a07fc31ae75a905a1ee Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 01:32:31 -0500 Subject: [PATCH 031/113] Rename conda/recipes/rapids-build/meta.yaml to conda/recipes/rapids-build-env/meta.yaml --- conda/recipes/{rapids-build => rapids-build-env}/meta.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conda/recipes/{rapids-build => rapids-build-env}/meta.yaml (100%) diff --git a/conda/recipes/rapids-build/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml similarity index 100% rename from conda/recipes/rapids-build/meta.yaml rename to conda/recipes/rapids-build-env/meta.yaml From 31c67963dec41f423bb4ac46bfc959ceaecd2e6d Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 01:33:20 -0500 Subject: [PATCH 032/113] ENH Add rapids build pkg to build script --- ci/cpu/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 4cca6050..706d5a78 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -78,3 +78,5 @@ build_pkg $CONDA_XGBOOST_RECIPE build_default_pkg $CONDA_XGBOOST_RECIPE build_pkg $CONDA_RAPIDS_RECIPE build_default_pkg $CONDA_RAPIDS_RECIPE +build_pkg $CONDA_RAPIDS_BUILD_RECIPE +build_default_pkg $CONDA_RAPIDS_BUILD_RECIPE From 7c7b87ecc19d3fd1e142577189dbb9d7b564d546 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 01:49:35 -0500 Subject: [PATCH 033/113] DOC Add license file for conda --- conda/recipes/rapids-build-env/LICENSE | 201 +++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 conda/recipes/rapids-build-env/LICENSE diff --git a/conda/recipes/rapids-build-env/LICENSE b/conda/recipes/rapids-build-env/LICENSE new file mode 100644 index 00000000..d9ea4d3d --- /dev/null +++ b/conda/recipes/rapids-build-env/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 NVIDIA Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From ebb99ae8a1c63358c26cda65f7b2555a56f767c3 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:53:23 -0500 Subject: [PATCH 034/113] ENH Create notebooks env pkg --- conda/recipes/rapids-notebook-env | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 conda/recipes/rapids-notebook-env diff --git a/conda/recipes/rapids-notebook-env b/conda/recipes/rapids-notebook-env new file mode 100644 index 00000000..213abd04 --- /dev/null +++ b/conda/recipes/rapids-notebook-env @@ -0,0 +1,52 @@ +# Copyright (c) 2020, NVIDIA CORPORATION. + +{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} +{% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set py_version = environ.get('CONDA_PY', 36) %} + +package: + name: rapids-notebook-env + version: {{ version }} + +source: + path: . + +build: + number: {{ build_offset }} + string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} + script_env: + - RAPIDS_VERSION + - RAPIDS_OFFSET + - CUDA_VERSION + +requirements: + host: + - python + run: + - conda-forge::blas=2.14=openblas + - cudatoolkit ={{ cuda_version }}.* + - cupy >=6.6.0,<8.0.0a0,!=7.1.0 + - cython >=0.29,<0.30 + - dask-labextension + - dask-ml + - ipython =7.3.* + - jupyterlab + - matplotlib + - networkx + - nodejs + - pytest + - scikit-learn =0.21.3 + - scipy =1.3.0 + - seaborn + +about: + home: http://rapids.ai/ + license: Apache-2.0 + license_file: LICENSE + summary: 'RAPIDS Notebook Dependencies and Tool Environment Installer' + description: | + Meta-package for installing notebook dependencies and tools needed to run RAPIDS notebooks. + doc_url: https://docs.rapids.ai/ + dev_url: https://github.com/rapidsai/ From 022f1ef0104c19438de65b031684da87b97d0a85 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:54:16 -0500 Subject: [PATCH 035/113] Rename conda/recipes/rapids-notebook-env to conda/recipes/rapids-notebook/meta.yaml --- conda/recipes/{rapids-notebook-env => rapids-notebook/meta.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conda/recipes/{rapids-notebook-env => rapids-notebook/meta.yaml} (100%) diff --git a/conda/recipes/rapids-notebook-env b/conda/recipes/rapids-notebook/meta.yaml similarity index 100% rename from conda/recipes/rapids-notebook-env rename to conda/recipes/rapids-notebook/meta.yaml From 6c3b003da62ffcbd5c6fcaeb350c106ddc423891 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:54:34 -0500 Subject: [PATCH 036/113] FIX Correct path --- conda/recipes/{rapids-notebook => rapids-notebook-env}/meta.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conda/recipes/{rapids-notebook => rapids-notebook-env}/meta.yaml (100%) diff --git a/conda/recipes/rapids-notebook/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml similarity index 100% rename from conda/recipes/rapids-notebook/meta.yaml rename to conda/recipes/rapids-notebook-env/meta.yaml From 26691acea116908677ddfa3b27c69edee0d79ceb Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:55:25 -0500 Subject: [PATCH 037/113] ENH Add notebook recipe to axis --- ci/axis/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 747b8dc4..59d2a04c 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -11,6 +11,9 @@ CONDA_RAPIDS_RECIPE: CONDA_RAPIDS_BUILD_RECIPE: - conda/recipes/rapids-build-env +CONDA_RAPIDS_NOTEBOOK_RECIPE: + - conda/recipes/rapids-notebook-env + RAPIDS_VERSION: - 0.13.0 From 58c78c584103b0e5d48dc290fe9ac8543a7624ea Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:56:26 -0500 Subject: [PATCH 038/113] ENH Add notebook env recipe to build --- ci/cpu/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 706d5a78..950f7f6f 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -80,3 +80,6 @@ build_pkg $CONDA_RAPIDS_RECIPE build_default_pkg $CONDA_RAPIDS_RECIPE build_pkg $CONDA_RAPIDS_BUILD_RECIPE build_default_pkg $CONDA_RAPIDS_BUILD_RECIPE +build_pkg $CONDA_RAPIDS_NOTEBOOK_RECIPE +build_default_pkg $CONDA_RAPIDS_NOTEBOOK_RECIPE + From 6dcf30773b549f1564e73e8c8eacc3b5d4a0909f Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:57:13 -0500 Subject: [PATCH 039/113] ENH Call default build at end of build --- ci/cpu/build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 950f7f6f..53a51aac 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -55,6 +55,9 @@ function build_pkg { # Remove build gpuci_logger "Clean up build cache..." conda build purge + + # Call default build + build_default_pkg ${1} } function build_default_pkg { @@ -75,11 +78,6 @@ function build_default_pkg { # Run builds build_pkg $CONDA_XGBOOST_RECIPE -build_default_pkg $CONDA_XGBOOST_RECIPE build_pkg $CONDA_RAPIDS_RECIPE -build_default_pkg $CONDA_RAPIDS_RECIPE build_pkg $CONDA_RAPIDS_BUILD_RECIPE -build_default_pkg $CONDA_RAPIDS_BUILD_RECIPE build_pkg $CONDA_RAPIDS_NOTEBOOK_RECIPE -build_default_pkg $CONDA_RAPIDS_NOTEBOOK_RECIPE - From 08da8887f14248839c03f6751c5d337b37fbc9a9 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 13:58:59 -0500 Subject: [PATCH 040/113] FIX Add missing umap-learn dep --- conda/recipes/rapids-notebook-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 213abd04..e39bfea0 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -40,6 +40,7 @@ requirements: - scikit-learn =0.21.3 - scipy =1.3.0 - seaborn + - umap-learn about: home: http://rapids.ai/ From d747978ed738f6915cdd16edb6beb0403f689af3 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 14:17:45 -0500 Subject: [PATCH 041/113] FIX Correct license path --- conda/recipes/rapids-notebook-env/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index e39bfea0..41c183d6 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -45,7 +45,7 @@ requirements: about: home: http://rapids.ai/ license: Apache-2.0 - license_file: LICENSE + license_file: ../../../LICENSE summary: 'RAPIDS Notebook Dependencies and Tool Environment Installer' description: | Meta-package for installing notebook dependencies and tools needed to run RAPIDS notebooks. From cf677ee19ce6888b4b6db90385e82f2d2a6f54cc Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 16:55:40 -0500 Subject: [PATCH 042/113] FIX Correct calling to prevent loop --- ci/cpu/build.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 53a51aac..61d6ef1f 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -55,9 +55,6 @@ function build_pkg { # Remove build gpuci_logger "Clean up build cache..." conda build purge - - # Call default build - build_default_pkg ${1} } function build_default_pkg { @@ -76,8 +73,15 @@ function build_default_pkg { fi } +function run_builds { + # Kick off main pkg b + build_pkg $1 + # Check and build default pkgs + build_default_pkg $1 +} + # Run builds -build_pkg $CONDA_XGBOOST_RECIPE -build_pkg $CONDA_RAPIDS_RECIPE -build_pkg $CONDA_RAPIDS_BUILD_RECIPE -build_pkg $CONDA_RAPIDS_NOTEBOOK_RECIPE +run_builds $CONDA_XGBOOST_RECIPE +run_builds $CONDA_RAPIDS_RECIPE +run_builds $CONDA_RAPIDS_BUILD_RECIPE +run_builds $CONDA_RAPIDS_NOTEBOOK_RECIPE From 5ee61c197124cd1af63f7a260c2c508860c15c05 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 14 Feb 2020 20:29:30 -0500 Subject: [PATCH 043/113] ENH Consolidate uploads to one upload at the end --- ci/cpu/build.sh | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 61d6ef1f..65115c9a 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -35,26 +35,6 @@ function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1} - - # Get output location - gpuci_logger "Get conda build output..." - export UPLOADFILE=`conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1} --output` - test -e ${UPLOADFILE} - - # Check for upload key - if [ -z "$MY_UPLOAD_KEY" ]; then - gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." - return 0 - fi - - # Upload - gpuci_logger "Upload starting..." - echo ${UPLOADFILE} - anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --force ${UPLOADFILE} - - # Remove build - gpuci_logger "Clean up build cache..." - conda build purge } function build_default_pkg { @@ -80,8 +60,26 @@ function run_builds { build_default_pkg $1 } +function upload_builds { + # Check for upload key + if [ -z "$MY_UPLOAD_KEY" ]; then + gpuci_logger "No upload key found, env var MY_UPLOAD_KEY not set, skipping upload..." + else + gpuci_logger "Upload key found, starting upload..." + gpuci_logger "Files to upload..." + ls /conda/conda-bld/linux-64/rapids*.tar.bz2 + + gpuci_logger "Starting upload..." + ls /conda/conda-bld/linux-64/rapids*.tar.bz2 | xargs gpuci_retry \ + anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label test --force + fi +} + # Run builds run_builds $CONDA_XGBOOST_RECIPE run_builds $CONDA_RAPIDS_RECIPE run_builds $CONDA_RAPIDS_BUILD_RECIPE run_builds $CONDA_RAPIDS_NOTEBOOK_RECIPE + +# Upload builds +upload_builds From edb9fb740a1ad4e6000638a776f81214243b08bf Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 11:45:48 -0500 Subject: [PATCH 044/113] FIX Correct license path --- 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 9a14f5d8..08cb7d81 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -83,7 +83,7 @@ requirements: about: home: http://rapids.ai/ license: Apache-2.0 - license_file: LICENSE + license_file: ../../../LICENSE summary: 'RAPIDS Build Dependencies and Tool Environment Installer' description: | Meta-package for installing build dependencies and tools needed to build all RAPIDS libraries. From 6ef30736c7042237b7830e5abd05d3bc500cb4e6 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 11:47:01 -0500 Subject: [PATCH 045/113] FIX Use root LICENSE file instead --- conda/recipes/rapids-build-env/LICENSE | 201 ------------------------- 1 file changed, 201 deletions(-) delete mode 100644 conda/recipes/rapids-build-env/LICENSE diff --git a/conda/recipes/rapids-build-env/LICENSE b/conda/recipes/rapids-build-env/LICENSE deleted file mode 100644 index d9ea4d3d..00000000 --- a/conda/recipes/rapids-build-env/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2020 NVIDIA Corporation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. From ae3c5c8523e5527ad6c081c65eb671d8ded610e0 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 11:48:34 -0500 Subject: [PATCH 046/113] FIX Add libcumlprims and ucx-py version matched --- conda/recipes/rapids-build-env/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 08cb7d81..61bb6b50 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -54,6 +54,7 @@ requirements: - isort - lapack - rapidsai::libclang =8.0.0 + - libcumlprims ={{ minor_version }}.* - libcypher-parser - libgcc-ng =7.3.0 - libgfortran-ng =7.3.0 @@ -79,6 +80,7 @@ requirements: - scipy =1.3.0 - streamz - twine + - ucx-py ={{ minor_version }}.* about: home: http://rapids.ai/ From ef836dac0931aa64cf0fef445654639e971ac2fa Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 12:03:30 -0500 Subject: [PATCH 047/113] ENH Add doc environment meta-pkg --- conda/recipes/rapids-doc-env/meta.yaml | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 conda/recipes/rapids-doc-env/meta.yaml diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml new file mode 100644 index 00000000..613ef64d --- /dev/null +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -0,0 +1,47 @@ +# Copyright (c) 2020, NVIDIA CORPORATION. + +{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} +{% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set py_version = environ.get('CONDA_PY', 36) %} + +package: + name: rapids-doc-env + version: {{ version }} + +source: + path: . + +build: + number: {{ build_offset }} + string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} + script_env: + - RAPIDS_VERSION + - RAPIDS_OFFSET + - CUDA_VERSION + script: python -m pip install sphinx-markdown-tables + +requirements: + host: + - python + - pip + run: + - doxygen + - nbsphinx + - numpydoc + - pandoc <=2.0.0 + - recommonmark + - sphinx + - sphinx_rtd_theme + - sphinxcontrib-websupport + +about: + home: http://rapids.ai/ + license: Apache-2.0 + license_file: ../../../LICENSE + summary: 'RAPIDS Documentation Dependencies and Tool Environment Installer' + description: | + Meta-package for installing documentation build dependencies and tools needed to build RAPIDS docs. + doc_url: https://docs.rapids.ai/ + dev_url: https://github.com/rapidsai/ From 4d30cc7d7089e1dfa41175aca45d78ea3a9333d3 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 12:32:55 -0500 Subject: [PATCH 048/113] FIX Add install support for needed pip pkg --- conda/recipes/rapids-doc-env/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 613ef64d..60a34d88 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -12,15 +12,16 @@ package: source: path: . + url: https://files.pythonhosted.org/packages/d2/44/543c3d96bac02ff4a9245ac624d175a50e91aebc7324a4bf4a2ec3b96da7/sphinx-markdown-tables-0.0.12.tar.gz + sha256: 08779e77832b6562b6b86e4270ae50b0b10010fdd35cf9aadcb5b8246571b933 build: number: {{ build_offset }} - string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} + string: py{{ py_version }}_{{ build_offset }} script_env: - RAPIDS_VERSION - RAPIDS_OFFSET - - CUDA_VERSION - script: python -m pip install sphinx-markdown-tables + script: python -m pip install --no-deps --ignore-installed . requirements: host: From de27c8de8b498be499d12f539028ea917ca3923e Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 12:35:15 -0500 Subject: [PATCH 049/113] ENH Add doc env recipe to the axis --- ci/axis/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 59d2a04c..32dfc573 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -14,6 +14,9 @@ CONDA_RAPIDS_BUILD_RECIPE: CONDA_RAPIDS_NOTEBOOK_RECIPE: - conda/recipes/rapids-notebook-env +CONDA_RAPIDS_DOC_RECIPE: + - conda/recipes/rapids-doc-env + RAPIDS_VERSION: - 0.13.0 From 2548254722c54c800cc1828bb9f5585de9b24684 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Sat, 15 Feb 2020 12:36:28 -0500 Subject: [PATCH 050/113] ENH Add doc env pkg to build script --- ci/cpu/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 65115c9a..da020e2b 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -80,6 +80,7 @@ run_builds $CONDA_XGBOOST_RECIPE run_builds $CONDA_RAPIDS_RECIPE run_builds $CONDA_RAPIDS_BUILD_RECIPE run_builds $CONDA_RAPIDS_NOTEBOOK_RECIPE +run_builds $CONDA_RAPIDS_DOC_RECIPE # Upload builds upload_builds From 45ba04c6a483208f8a926c25536040c0cfe6682b Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 18 Feb 2020 20:54:54 -0500 Subject: [PATCH 051/113] FIX Change conda label to main --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index da020e2b..ae6569ca 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -71,7 +71,7 @@ function upload_builds { gpuci_logger "Starting upload..." ls /conda/conda-bld/linux-64/rapids*.tar.bz2 | xargs gpuci_retry \ - anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label test --force + anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --force fi } From 27ff1ebaa4a682dbc2e4a553b9e3198e3204a078 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 2 Mar 2020 13:04:15 -0500 Subject: [PATCH 052/113] Update meta.yaml --- conda/recipes/rapids-notebook-env/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 41c183d6..31ae9644 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -32,7 +32,7 @@ requirements: - dask-labextension - dask-ml - ipython =7.3.* - - jupyterlab + - jupyterlab =1.2.0 - matplotlib - networkx - nodejs From d3c1b7716c8f33e0f29e0d40bdd98c71f0e1915d Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Tue, 3 Mar 2020 10:54:00 -0500 Subject: [PATCH 053/113] Relax jupyterlab pin --- conda/recipes/rapids-notebook-env/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 31ae9644..104ace6b 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -32,7 +32,7 @@ requirements: - dask-labextension - dask-ml - ipython =7.3.* - - jupyterlab =1.2.0 + - jupyterlab =1.2.* - matplotlib - networkx - nodejs From 73bfd23a88b51d74f9ed8ce2e253c7cc7c65288c Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 3 Mar 2020 09:00:27 -0800 Subject: [PATCH 054/113] FIX Add cuxfilter to meta pkg --- 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 2e0b3e2e..a429c743 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -40,6 +40,7 @@ requirements: - cugraph ={{ minor_version }}.* - cuml ={{ minor_version }}.* - cuspatial ={{ minor_version }}.* + - cuxfilter ={{ minor_version }}.* - dask-cuda ={{ minor_version }}.* - dask-xgboost ={{ dxgb_version }} - nvstrings ={{ minor_version }}.* From d6f8a258327ac33331a65ef1f413f7281ce321f8 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 3 Mar 2020 23:05:30 -0800 Subject: [PATCH 055/113] Update cupy to cuMLs minimum --- 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 a429c743..01b236f1 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -31,7 +31,7 @@ requirements: - python run: - cudatoolkit ={{ cuda_version }}.* - - cupy>=6.6.0,<7 + - cupy>=7,<8.0.0a0 - nccl =2.5.* - numba ={{ numba_version }}.* - numpy>={{ numpy_version }}.* From ea1a678c794379db6570aeb0b2c5b17e86e4e5a9 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 3 Mar 2020 23:07:35 -0800 Subject: [PATCH 056/113] Remove stale cuxfilter entry --- conda/recipes/rapids/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index 01b236f1..8fe12611 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -40,7 +40,6 @@ requirements: - cugraph ={{ minor_version }}.* - cuml ={{ minor_version }}.* - cuspatial ={{ minor_version }}.* - - cuxfilter ={{ minor_version }}.* - dask-cuda ={{ minor_version }}.* - dask-xgboost ={{ dxgb_version }} - nvstrings ={{ minor_version }}.* From 0ebf66f5dfeac7dd8392e091236c63bb6a06b3b7 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Wed, 11 Mar 2020 12:34:44 -0400 Subject: [PATCH 057/113] Bump xgboost version --- ci/axis/nightly.yml | 2 +- ci/axis/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 32dfc573..8d021785 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -24,7 +24,7 @@ DASK_XGBOOST_VERSION: - 0.2.0.dev28 XGBOOST_VERSION: - - 1.0.0dev.rapidsai0.13 + - 1.0.2dev.rapidsai0.13 NUMBA_VERSION: - 0.46.0 diff --git a/ci/axis/release.yml b/ci/axis/release.yml index 89676b0d..625dfacb 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -15,7 +15,7 @@ DASK_XGBOOST_VERSION: - 0.2.0.dev28 XGBOOST_VERSION: - - 1.0.0dev.rapidsai0.13 + - 1.0.2dev.rapidsai0.13 NUMBA_VERSION: - 0.46.0 From 6c49006fc9523ac7a3240e333d8370909002460f Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 11 Mar 2020 12:56:01 -0700 Subject: [PATCH 058/113] Pin Bokeh to 1.* --- conda/recipes/rapids-notebook-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 104ace6b..039ad828 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -25,6 +25,7 @@ requirements: host: - python run: + - bokeh =1.* - conda-forge::blas=2.14=openblas - cudatoolkit ={{ cuda_version }}.* - cupy >=6.6.0,<8.0.0a0,!=7.1.0 From c62b26755865701a8923c2f5153c0cd135a6abce Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 19 Mar 2020 10:36:10 -0400 Subject: [PATCH 059/113] FIX Skip existing builds --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index ae6569ca..6e683935 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -71,7 +71,7 @@ function upload_builds { gpuci_logger "Starting upload..." ls /conda/conda-bld/linux-64/rapids*.tar.bz2 | xargs gpuci_retry \ - anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --force + anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai-nightly} --label main --skip-existing fi } From 752c3dddb3aa6655122040b4ac31460c03fde553 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 20 Mar 2020 13:38:34 -0400 Subject: [PATCH 060/113] ENH Update with latest versions from libraries Also add missing packages --- conda/recipes/rapids-build-env/meta.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 61bb6b50..11a138b9 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -36,15 +36,17 @@ requirements: - conda-build =3.18.11 - conda-verify =3.1.1 - cudatoolkit ={{ cuda_version }}.* - - cupy >=6.6.0,<8.0.0a0,!=7.1.0 + - cupy >=7,<8.0.0a0,!=7.1.0 - cython >=0.29,<0.30 - - dask >=2.1.0 - - distributed >=2.1.0 + - dask >=2.12.0 + - distributed >=2.12.0 - dlpack =0.2 - double-conversion =3.1.5 - - fastavro =0.22.3 + - fastavro >=0.22.0 + - feather-format - flake8 - flatbuffers =1.10.0 + - fsspec >=0.3.3 - gcsfs - gdal =2.4.* - git @@ -61,9 +63,11 @@ requirements: - liblapack - librdkafka =1.2.2 - libstdcxx-ng =7.3.0 + - lightgbm - make - moto - nccl =2.5.* + - networkx >=2.3 - numba >=0.46,<0.47 - numpy >=1.17.3.* - pandas >=0.25,<0.26 @@ -78,9 +82,11 @@ requirements: - setuptools - scikit-learn =0.21.3 - scipy =1.3.0 + - statsmodels - streamz - twine - ucx-py ={{ minor_version }}.* + - umap-learn about: home: http://rapids.ai/ From 51501aec52faef3f9302dd9280694decb81b41c6 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 09:40:01 -0400 Subject: [PATCH 061/113] ENH Move recipe paths to build.sh --- ci/axis/nightly.yml | 15 --------------- ci/axis/release.yml | 6 ------ ci/cpu/build.sh | 7 +++++++ 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 8d021785..16154f0e 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -1,21 +1,6 @@ CONDA_USERNAME: - rapidsai-nightly -# Note that gpuCI builds `rapids-xgboost first as it is needed by `rapids` -CONDA_XGBOOST_RECIPE: - - conda/recipes/rapids-xgboost - -CONDA_RAPIDS_RECIPE: - - conda/recipes/rapids - -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 RAPIDS_VERSION: - 0.13.0 diff --git a/ci/axis/release.yml b/ci/axis/release.yml index 625dfacb..f0034379 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -1,12 +1,6 @@ CONDA_USERNAME: - rapidsai -# Note that gpuCI builds `rapids-xgboost first as it is needed by `rapids` -CONDA_XGBOOST_RECIPE: - - conda/recipes/rapids-xgboost - -CONDA_RAPIDS_RECIPE: - - conda/recipes/rapids RAPIDS_VERSION: - 0.13.0 diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 6e683935..200ed00e 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -14,6 +14,13 @@ export HOME=$WORKSPACE # Save original build offset export ORIG_OFFSET=$RAPIDS_OFFSET +# Set recipe paths +CONDA_XGBOOST_RECIPE="conda/recipes/rapids-xgboost" +CONDA_RAPIDS_RECIPE="conda/recipes/rapids" +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" + # Activate conda env source activate gdf From 4644df04a0050322edbb05665b1aa1aacb5ce581 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 09:43:37 -0400 Subject: [PATCH 062/113] ENH Replace '_VERSION' with '_VER' This is to reduce the collision with defined env vars like 'CUDA_VERSION' --- ci/axis/nightly.yml | 9 +++++---- ci/axis/release.yml | 9 +++++---- ci/cpu/build.sh | 8 ++++---- conda/recipes/rapids-build-env/meta.yaml | 4 ++-- conda/recipes/rapids-doc-env/meta.yaml | 4 ++-- conda/recipes/rapids-notebook-env/meta.yaml | 4 ++-- conda/recipes/rapids-xgboost/meta.yaml | 4 ++-- conda/recipes/rapids/meta.yaml | 4 ++-- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 16154f0e..b7606cd1 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -2,7 +2,7 @@ CONDA_USERNAME: - rapidsai-nightly -RAPIDS_VERSION: +RAPIDS_VER: - 0.13.0 DASK_XGBOOST_VERSION: @@ -17,14 +17,15 @@ NUMBA_VERSION: NUMPY_VERSION: - 1.17.3 -CUDA_VERSION: +# Use CUDA_VER to not clobber `CUDA_VERSION` in the container +CUDA_VER: - 10.2 - 10.1 - 10.0 -DEFAULT_CUDA_VERSION: +DEFAULT_CUDA_VER: - 10.0 -PYTHON_VERSION: +PYTHON_VER: - 3.6 - 3.7 diff --git a/ci/axis/release.yml b/ci/axis/release.yml index f0034379..d05c97a0 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -2,7 +2,7 @@ CONDA_USERNAME: - rapidsai -RAPIDS_VERSION: +RAPIDS_VER: - 0.13.0 DASK_XGBOOST_VERSION: @@ -17,14 +17,15 @@ NUMBA_VERSION: NUMPY_VERSION: - 1.17.3 -CUDA_VERSION: +# Use CUDA_VER to not clobber `CUDA_VERSION` in the container +CUDA_VER: - 10.2 - 10.1 - 10.0 -DEFAULT_CUDA_VERSION: +DEFAULT_CUDA_VER: - 10.0 -PYTHON_VERSION: +PYTHON_VER: - 3.6 - 3.7 diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 200ed00e..ab3e2d03 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -45,9 +45,9 @@ function build_pkg { } function build_default_pkg { - # Build default version if current version matches DEFAULT_CUDA_VERSION - if [ "$CUDA_VERSION" == "$DEFAULT_CUDA_VERSION" ] ; then - gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is the DEFAULT_CUDA_VERSION, building package again with incremented build number..." + # Build default version if current version matches DEFAULT_CUDA_VER + if [ "$CUDA_VER" == "$DEFAULT_CUDA_VER" ] ; then + gpuci_logger "Current CUDA_VER '$CUDA_VER' is the DEFAULT_CUDA_VER, building package again with incremented build number..." gpuci_logger "Previous build number '$RAPIDS_OFFSET'" export RAPIDS_OFFSET=$((RAPIDS_OFFSET+1)) gpuci_logger "New build number '$RAPIDS_OFFSET'" @@ -56,7 +56,7 @@ function build_default_pkg { export RAPIDS_OFFSET=$ORIG_OFFSET gpuci_logger "Reset build number after default build '$RAPIDS_OFFSET'" else - gpuci_logger "Current CUDA_VERSION '$CUDA_VERSION' is not DEFAULT_CUDA_VERSION, skipping default build..." + gpuci_logger "Current CUDA_VER '$CUDA_VER' is not DEFAULT_CUDA_VER, skipping default build..." fi } diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 11a138b9..fc0f7beb 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -1,6 +1,6 @@ # Copyright (c) 2020, NVIDIA CORPORATION. -{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} @@ -17,7 +17,7 @@ build: number: {{ build_offset }} string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} script_env: - - RAPIDS_VERSION + - RAPIDS_VER - RAPIDS_OFFSET - CUDA_VERSION diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 60a34d88..e154cb56 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -1,6 +1,6 @@ # Copyright (c) 2020, NVIDIA CORPORATION. -{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} @@ -19,7 +19,7 @@ build: number: {{ build_offset }} string: py{{ py_version }}_{{ build_offset }} script_env: - - RAPIDS_VERSION + - RAPIDS_VER - RAPIDS_OFFSET script: python -m pip install --no-deps --ignore-installed . diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 039ad828..ac4fe70e 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -1,6 +1,6 @@ # Copyright (c) 2020, NVIDIA CORPORATION. -{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} @@ -17,7 +17,7 @@ build: number: {{ build_offset }} string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} script_env: - - RAPIDS_VERSION + - RAPIDS_VER - RAPIDS_OFFSET - CUDA_VERSION diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index cce2c7ed..5015d90e 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -1,6 +1,6 @@ # Copyright (c) 2019, NVIDIA CORPORATION. -{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} @@ -18,7 +18,7 @@ build: number: {{ build_offset }} string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} script_env: - - RAPIDS_VERSION + - RAPIDS_VER - RAPIDS_OFFSET - CUDA_VERSION - XGBOOST_VERSION diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index 8fe12611..c48aa63e 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -1,6 +1,6 @@ # Copyright (c) 2019, NVIDIA CORPORATION. -{% set version = environ.get('RAPIDS_VERSION', '0.0.0.dev') %} +{% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} @@ -21,7 +21,7 @@ build: number: {{ build_offset }} string: cuda{{ cuda_version }}_py{{ py_version }}_{{ build_offset }} script_env: - - RAPIDS_VERSION + - RAPIDS_VER - RAPIDS_OFFSET - CUDA_VERSION - DASK_XGBOOST_VERSION From c5440c86ff84309e610541c6c84e304803e7cee9 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 09:45:39 -0400 Subject: [PATCH 063/113] ENH Create new yaml files for nigthy/release vers Update recipes and ci/cpu/build.sh to use them --- ci/axis/nightly.yml | 14 +--- ci/axis/release.yml | 14 +--- ci/cpu/build.sh | 3 +- conda/recipes/nightly-versions.yaml | 85 +++++++++++++++++++++ conda/recipes/rapids-build-env/meta.yaml | 77 +++++++++++-------- conda/recipes/rapids-doc-env/meta.yaml | 13 +++- conda/recipes/rapids-notebook-env/meta.yaml | 27 +++++-- conda/recipes/rapids-xgboost/meta.yaml | 17 ++++- conda/recipes/rapids/meta.yaml | 24 +++--- conda/recipes/release-versions.yaml | 85 +++++++++++++++++++++ 10 files changed, 279 insertions(+), 80 deletions(-) create mode 100644 conda/recipes/nightly-versions.yaml create mode 100644 conda/recipes/release-versions.yaml diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index b7606cd1..183ef8d5 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -1,22 +1,12 @@ CONDA_USERNAME: - rapidsai-nightly +CONDA_CONFIG_FILE: + - conda/recipes/nightly-versions.yaml RAPIDS_VER: - 0.13.0 -DASK_XGBOOST_VERSION: - - 0.2.0.dev28 - -XGBOOST_VERSION: - - 1.0.2dev.rapidsai0.13 - -NUMBA_VERSION: - - 0.46.0 - -NUMPY_VERSION: - - 1.17.3 - # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 10.2 diff --git a/ci/axis/release.yml b/ci/axis/release.yml index d05c97a0..e2e94b39 100644 --- a/ci/axis/release.yml +++ b/ci/axis/release.yml @@ -1,22 +1,12 @@ CONDA_USERNAME: - rapidsai +CONDA_CONFIG_FILE: + - conda/recipes/release-versions.yaml RAPIDS_VER: - 0.13.0 -DASK_XGBOOST_VERSION: - - 0.2.0.dev28 - -XGBOOST_VERSION: - - 1.0.2dev.rapidsai0.13 - -NUMBA_VERSION: - - 0.46.0 - -NUMPY_VERSION: - - 1.17.3 - # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: - 10.2 diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index ab3e2d03..e5bcfe4f 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -41,7 +41,8 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." - conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge --python=${PYTHON_VERSION} ${1} + conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \ + --python=${PYTHON_VER} --append-file ${CONDA_CONFIG_FILE} ${1} } function build_default_pkg { diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml new file mode 100644 index 00000000..b940f6ba --- /dev/null +++ b/conda/recipes/nightly-versions.yaml @@ -0,0 +1,85 @@ +### +# This file is used by `/ci/cpu/build.sh` for NIGHTLY builds +### + +# Versions for `rapids` meta-pkg +dask_xgboost_version: + - '=0.2.0.dev28' + +# Versions for `rapids-xgboost` meta-pkg +xgboost_version: + - '=1.0.2dev.rapidsai0.13' + +# Versions for conda +conda_version: + - '=4.7.12' +conda_build_version: + - '=3.18.11' +conda_verify_version: + - '3.1.1' + +# Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack +build_stack_version: + - '=7.3.0' + +# Shared versions across meta-pkgs +arrow_version: + - '=0.15.0' +blas_version: + - '=2.14=openblas' +bokeh_version: + - '=1.*' +boost_cpp_version: + - '=1.70.0' +cmake_version: + - '=3.14.5' +cmake_setuptools_version: + - '>=0.1.3' +cupy_version: + - '>=7,<8.0.0a0,!=7.1.0' +cython_version: + - '>=0.29,<0.30' +dask_version: + - '>=2.12.0' +distributed_version: + - '>=2.12.0' +dlpack_version: + - '=0.2' +double_conversion_version: + - '=3.1.5' +fastavro_version: + - '>=0.22.0' +flatbuffers_version: + - '=1.10.0' +fsspec_version: + - '>=0.3.3' +gdal_version: + - '=2.4.*' +ipython_version: + - '=7.3.*' +jupyterlab_version: + - '=1.2.*' +libclang_rapidsai_version: + - '=8.0.0' +librdkafka_version: + - '=1.2.2' +nccl_version: + - '=2.5.*' +networkx_version: + - '>=2.3' +numba_version: + - '>=0.48,<0.49' +numpy_version: + - '>=1.17.3' +pandas_version: + - '>=0.25,<0.26' +pandoc_version: + - '<=2.0.0' +protobuf_version: + - '>=3.4.1,<4.0.0' +rapidjson_version: + - '=1.1.0' +scikit_learn_version: + - '=0.21.3' +scipy_version: + - '=1.3.0' diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index fc0f7beb..925c57df 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -6,6 +6,17 @@ {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').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.sh` and `ci/axis/*.yaml` +# +# Manual builds need to use the `conda build` flag of `-m .yaml` +# to set these versions +### + package: name: rapids-build-env version: {{ version }} @@ -25,63 +36,63 @@ requirements: host: - python run: - - arrow-cpp =0.15.0 + - arrow-cpp {{ arrow_version }} - black - - conda-forge::blas=2.14=openblas - - boost-cpp =1.70.0 + - conda-forge::blas{{ blas_version }} + - boost-cpp {{ boost_cpp_version }} - boto3 - - cmake =3.14.5 - - cmake_setuptools >=0.1.3 - - conda =4.7.12 - - conda-build =3.18.11 - - conda-verify =3.1.1 + - cmake {{ cmake_version }} + - cmake_setuptools {{ cmake_setuptools_version }} + - conda {{ conda_version }} + - conda-build {{ conda_build_version }} + - conda-verify {{ conda_verify_version }} - cudatoolkit ={{ cuda_version }}.* - - cupy >=7,<8.0.0a0,!=7.1.0 - - cython >=0.29,<0.30 - - dask >=2.12.0 - - distributed >=2.12.0 - - dlpack =0.2 - - double-conversion =3.1.5 - - fastavro >=0.22.0 + - cupy {{ cupy_version }} + - cython {{ cython_version }} + - dask {{ dask_version }} + - distributed {{ distributed_version }} + - dlpack {{ dlpack_version }} + - double-conversion {{ double_conversion_version }} + - fastavro {{ fastavro_version }} - feather-format - flake8 - - flatbuffers =1.10.0 - - fsspec >=0.3.3 + - flatbuffers {{ flatbuffers_version }} + - fsspec {{ fsspec_version }} - gcsfs - - gdal =2.4.* + - gdal {{ gdal_version }} - git - graphviz - httpretty - hypothesis - isort - lapack - - rapidsai::libclang =8.0.0 + - rapidsai::libclang {{ libclang_rapidsai_version }} - libcumlprims ={{ minor_version }}.* - libcypher-parser - - libgcc-ng =7.3.0 - - libgfortran-ng =7.3.0 + - libgcc-ng {{ build_stack_version }} + - libgfortran-ng {{ build_stack_version }} - liblapack - - librdkafka =1.2.2 - - libstdcxx-ng =7.3.0 + - librdkafka {{ librdkafka_version }} + - libstdcxx-ng {{ build_stack_version }} - lightgbm - make - moto - - nccl =2.5.* - - networkx >=2.3 - - numba >=0.46,<0.47 - - numpy >=1.17.3.* - - pandas >=0.25,<0.26 - - protobuf >=3.4.1,<4.0.0 - - pyarrow =0.15.0 + - nccl {{ nccl_version }} + - networkx {{ networkx_version }} + - numba {{ numba_version }} + - numpy {{ numpy_version }} + - pandas {{ pandas_version }} + - protobuf {{ protobuf_version }} + - pyarrow {{ arrow_version }} - pytest - pytest-cov - python - - rapidjson =1.1.0 + - rapidjson {{ rapidjson_version }} - ripgrep - s3fs - setuptools - - scikit-learn =0.21.3 - - scipy =1.3.0 + - scikit-learn {{ scikit_learn_version }} + - scipy {{ scipy_version }} - statsmodels - streamz - twine diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index e154cb56..47b9be7d 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -6,6 +6,17 @@ {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').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.sh` and `ci/axis/*.yaml` +# +# Manual builds need to use the `conda build` flag of `-m .yaml` +# to set these versions +### + package: name: rapids-doc-env version: {{ version }} @@ -31,7 +42,7 @@ requirements: - doxygen - nbsphinx - numpydoc - - pandoc <=2.0.0 + - pandoc {{ pandoc_version }} - recommonmark - sphinx - sphinx_rtd_theme diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index ac4fe70e..1571fe74 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -6,6 +6,17 @@ {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').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.sh` and `ci/axis/*.yaml` +# +# Manual builds need to use the `conda build` flag of `-m .yaml` +# to set these versions +### + package: name: rapids-notebook-env version: {{ version }} @@ -25,21 +36,21 @@ requirements: host: - python run: - - bokeh =1.* - - conda-forge::blas=2.14=openblas + - bokeh {{ bokeh_version }} + - conda-forge::blas{{ blas_version }} - cudatoolkit ={{ cuda_version }}.* - - cupy >=6.6.0,<8.0.0a0,!=7.1.0 - - cython >=0.29,<0.30 + - cupy {{ cupy_version }} + - cython {{ cython_version }} - dask-labextension - dask-ml - - ipython =7.3.* - - jupyterlab =1.2.* + - ipython {{ ipython_version }} + - jupyterlab {{ jupyterlab_version }} - matplotlib - networkx - nodejs - pytest - - scikit-learn =0.21.3 - - scipy =1.3.0 + - scikit-learn {{ scikit_learn_version }} + - scipy {{ scipy_version }} - seaborn - umap-learn diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 5015d90e..d9dcfbc2 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -5,7 +5,17 @@ {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} -{% set xgb_version = environ.get('XGBOOST_VERSION', '1.0.0.SNAPSHOT') %} + +### +# 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.sh` and `ci/axis/*.yaml` +# +# Manual builds need to use the `conda build` flag of `-m .yaml` +# to set these versions +### package: name: rapids-xgboost @@ -21,16 +31,15 @@ build: - RAPIDS_VER - RAPIDS_OFFSET - CUDA_VERSION - - XGBOOST_VERSION requirements: host: - python run: - cudatoolkit ={{ cuda_version }}.* - - nccl =2.5.* + - nccl {{ nccl_version }} - python - - xgboost ={{ xgb_version }} + - xgboost {{ xgboost_version }} about: home: http://rapids.ai/ diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index c48aa63e..dad6ddc2 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -6,9 +6,16 @@ {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} -{% set dxgb_version = environ.get('DASK_XGBOOST_VERSION', '0.2.0.dev28') %} -{% set numba_version = environ.get('NUMBA_VERSION', '0.46.0') %} -{% set numpy_version = environ.get('NUMPY_VERSION', '1.17.3') %} +### +# 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.sh` and `ci/axis/*.yaml` +# +# Manual builds need to use the `conda build` flag of `-m .yaml` +# to set these versions +### package: name: rapids @@ -24,24 +31,23 @@ build: - RAPIDS_VER - RAPIDS_OFFSET - CUDA_VERSION - - DASK_XGBOOST_VERSION requirements: host: - python run: - cudatoolkit ={{ cuda_version }}.* - - cupy>=7,<8.0.0a0 - - nccl =2.5.* - - numba ={{ numba_version }}.* - - numpy>={{ numpy_version }}.* + - cupy {{ cupy_version }} + - nccl {{ nccl_version }} + - numba {{ numba_version }} + - numpy {{ numpy_version }} - python - cudf ={{ minor_version }}.* - cugraph ={{ minor_version }}.* - cuml ={{ minor_version }}.* - cuspatial ={{ minor_version }}.* - dask-cuda ={{ minor_version }}.* - - dask-xgboost ={{ dxgb_version }} + - dask-xgboost ={{ dask_xgboost_version }} - nvstrings ={{ minor_version }}.* - rapids-xgboost ={{ minor_version }}.* - rmm ={{ minor_version }}.* diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml new file mode 100644 index 00000000..f1820adc --- /dev/null +++ b/conda/recipes/release-versions.yaml @@ -0,0 +1,85 @@ +### +# This file is used by `/ci/cpu/build.sh` for RELEASE builds +### + +# Versions for `rapids` meta-pkg +dask_xgboost_version: + - '=0.2.0.dev28' + +# Versions for `rapids-xgboost` meta-pkg +xgboost_version: + - '=1.0.2dev.rapidsai0.13' + +# Versions for conda +conda_version: + - '=4.7.12' +conda_build_version: + - '=3.18.11' +conda_verify_version: + - '3.1.1' + +# Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack +build_stack_version: + - '=7.3.0' + +# Shared versions across meta-pkgs +arrow_version: + - '=0.15.0' +blas_version: + - '=2.14=openblas' +bokeh_version: + - '=1.*' +boost_cpp_version: + - '=1.70.0' +cmake_version: + - '=3.14.5' +cmake_setuptools_version: + - '>=0.1.3' +cupy_version: + - '>=7,<8.0.0a0,!=7.1.0' +cython_version: + - '>=0.29,<0.30' +dask_version: + - '>=2.12.0' +distributed_version: + - '>=2.12.0' +dlpack_version: + - '=0.2' +double_conversion_version: + - '=3.1.5' +fastavro_version: + - '>=0.22.0' +flatbuffers_version: + - '=1.10.0' +fsspec_version: + - '>=0.3.3' +gdal_version: + - '=2.4.*' +ipython_version: + - '=7.3.*' +jupyterlab_version: + - '=1.2.*' +libclang_rapidsai_version: + - '=8.0.0' +librdkafka_version: + - '=1.2.2' +nccl_version: + - '=2.5.*' +networkx_version: + - '>=2.3' +numba_version: + - '>=0.48,<0.49' +numpy_version: + - '>=1.17.3' +pandas_version: + - '>=0.25,<0.26' +pandoc_version: + - '<=2.0.0' +protobuf_version: + - '>=3.4.1,<4.0.0' +rapidjson_version: + - '=1.1.0' +scikit_learn_version: + - '=0.21.3' +scipy_version: + - '=1.3.0' From a294f5f44ff49b24036c87ca87599adea16c62db Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 09:46:20 -0400 Subject: [PATCH 064/113] FIX Update default CUDA to 10.0 --- conda/recipes/rapids-build-env/meta.yaml | 2 +- conda/recipes/rapids-doc-env/meta.yaml | 2 +- conda/recipes/rapids-notebook-env/meta.yaml | 2 +- conda/recipes/rapids-xgboost/meta.yaml | 2 +- conda/recipes/rapids/meta.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index 925c57df..d9640147 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -3,7 +3,7 @@ {% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} -{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} ### diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 47b9be7d..1f02cab3 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -3,7 +3,7 @@ {% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} -{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} ### diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 1571fe74..e2ccb2dd 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -3,7 +3,7 @@ {% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} -{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} ### diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index d9dcfbc2..ef6e9d7e 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -3,7 +3,7 @@ {% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} -{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} ### diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index dad6ddc2..1568ca77 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -3,7 +3,7 @@ {% set version = environ.get('RAPIDS_VER', '0.0.0.dev') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set build_offset = environ.get('RAPIDS_OFFSET', 0) %} -{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '9.2').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '10.0').split('.')[:2]) %} {% set py_version = environ.get('CONDA_PY', 36) %} ### From d537a4f9873d9ed4db14a24065d34b2f715a36ea Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 09:46:45 -0400 Subject: [PATCH 065/113] ENH Add 0.14 to nightly axis --- ci/axis/nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yml index 183ef8d5..7ac794aa 100644 --- a/ci/axis/nightly.yml +++ b/ci/axis/nightly.yml @@ -6,6 +6,7 @@ CONDA_CONFIG_FILE: RAPIDS_VER: - 0.13.0 + - 0.14.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: From 1c72beb5ee78ec85375586a7ba9c7ad99c133e60 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 10:34:23 -0400 Subject: [PATCH 066/113] ENH Rename to match other YAML files --- ci/axis/{nightly.yml => nightly.yaml} | 0 ci/axis/{release.yml => release.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename ci/axis/{nightly.yml => nightly.yaml} (100%) rename ci/axis/{release.yml => release.yaml} (100%) diff --git a/ci/axis/nightly.yml b/ci/axis/nightly.yaml similarity index 100% rename from ci/axis/nightly.yml rename to ci/axis/nightly.yaml diff --git a/ci/axis/release.yml b/ci/axis/release.yaml similarity index 100% rename from ci/axis/release.yml rename to ci/axis/release.yaml From a4dc3ed7bc534bb5dab4fdc09293aeea4a80ccf3 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 10:35:05 -0400 Subject: [PATCH 067/113] DOC Update README with more information --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ae1d942d..4bc8e14e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,17 @@ -# integration +#
  Integration + RAPIDS - combined conda package & integration tests for all of RAPIDS libraries -The conda recipe in the `conda` folder provides the RAPIDS meta-package, which -when installed will provide the latest RAPIDS libraries for the given version. +## RAPIDS Meta-packages + +The conda recipe in the `conda` folder provides the RAPIDS meta-packages, which +when installed will provide the latest RAPIDS libraries for the given version or +setup `build`, `doc`, or `notebook` environments for RAPIDS. + +See the [README](conda/recipes/README.md) for more information about the +meta-packages and how to update versions. + +## RAPIDS Integration Tests Test scripts in the `test` folder verify proper interaction across multiple RAPIDS APIs. Tests are separated into individual subfolders based on the usage From 9d1d92d2803de673c288484fcf3eeb9b938a2207 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 10:35:24 -0400 Subject: [PATCH 068/113] DOC Add README on versioning and recipe changes --- conda/recipes/README.md | 135 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 conda/recipes/README.md diff --git a/conda/recipes/README.md b/conda/recipes/README.md new file mode 100644 index 00000000..caee8210 --- /dev/null +++ b/conda/recipes/README.md @@ -0,0 +1,135 @@ +#
  Meta-packages + +## Overview + +These packages provide one-line installs for RAPIDS as well as environment +setups for RAPIDS users and the RAPIDS [containers](https://github.com/rapidsai/build). + +## Meta-packages + +### Package Availability + +These meta-packages are available in two channels: + +Channel Name | Purpose +--- | --- +`rapidsai` | Release versions of the packages; tied to a stable release of RAPIDS +`rapidsai-nightly` | Nightly versions of the packages; allows for install of WIP nightly versions of RAPIDS + +### Install Packages + +The install meta-packages are for RAPIDS installation and version pinning of core +libraries to a RAPIDS release: + +Package Name | Purpose +--- | --- +`rapids` | Provide a one package install for all RAPIDS libraries, version matched to a RAPIDS release +`rapids-xgboost` | Defines the version of `xgboost` used for a RAPIDS release + +### Environment Packages + +The environment meta-packages are used for setting up `build`, `doc`, and +`notebook` environments for users and in our RAPIDS [containers](https://github.com/rapidsai/build). + +Package Name | Purpose +--- | --- +`rapids-build-env` | Installs all `conda` build dependencies to build & test RAPIDS libraries from source +`rapids-doc-env` | Installs all tools needed to build RAPIDS documentation +`rapids-notebook-env` | Installs a Jupyter Notebook server and other dependencies to run RAPIDS example notebooks; used in the `runtime` [stable](https://hub.docker.com/r/rapidsai/rapidsai/tags?page=1&name=runtime) and [nightly](https://hub.docker.com/r/rapidsai/rapidsai-nightly/tags?page=1&name=runtime) RAPIDS containers. + +## Managing Versions + +Packages without version restrictions do not need to use the following process +and can be simply added as a `conda` package name to the recipe. For all other +packages, follow this process to add/update versions used across all +meta-packages: + +1. Examine the `meta.yaml` recipe to be modified +2. Check if there is a pre-existing version definition like +``` +cupy {{ cupy_version }} +``` +3. If so, skip to the section [Updating Versions](#updating-versions) +4. If not, continue with the section [Adding Versions](#adding-versions) + +### Adding Versions + +For new packages or those that do not have defined versions they need to be +added. + +#### Modifying Recipes + +To add a package with versioning to the recipe we need the `PACKAGE_NAME` and +the `VERSIONING_NAME` added to the file. + +- `PACKAGE_NAME` - is the conda package name +- `VERSIONING_NAME` - is the conda package name with `-` replaced with `_` and a suffix of `_version` added + - For example + - `cupy` would become `cupy_version` + - `scikit-learn` would become `scikit_learn_version` + +Once the `PACKAGE_NAME` and `VERSIONING_NAME` are ready, we can add them to +the `meta.yml` as follows: + +``` +PACKAGE_NAME {{ VERSIONING_NAME }} +``` + +- **NOTE:** The `VERSIONING_NAME` must be surrounded by the `{{ }}` for the substitution to work. + +Using our examples of `cupy` and `scikit-learn` we would have these entries in +the `meta.yaml`: + +``` +cupy {{ cupy_version }} +``` +``` +scikit-learn {{ scikit_learn_version }} +``` + +#### Modifying Versions Files + +There are two versions files that are in `conda/recipes`: + - `release-versions.yaml` - These are versions used by the `ci/axis/release.yaml` for RELEASE builds + - `nightly-versions.yaml` - These are versions used by the `ci/axis/nightly.yaml` for NIGHTLY builds + +Both of these files will need a config added to specify the version for the +newly created `VERSIONING_NAME`. + +For each `VERSIONING_NAME` we need a `VERSION_SPEC`. This can be any of the +standard `conda` version specifiers: +``` +>=1.8.0 +>=0.48,<0.49 +>=7.0,<8.0.0a0,!=7.1.0 +=2.5.* +``` + +Combined together each of the versions files would add the following for each +`VERSIONING_NAME`: +``` +VERSIONING_NAME: + - 'VERSION_SPEC' +``` + +Using our examples of `cupy` and `scikit-learn` we would have these entries in +the `meta.yaml`: + +``` +cupy_version: + - '>=7,<8.0.0a0,!=7.1.0' +``` +``` +scikit_learn_version: + - '=0.21.3' +``` + +### Updating Versions + +There are two versions files that are in `conda/recipes`: + - `release-versions.yaml` - These are versions used by the `ci/axis/release.yaml` for RELEASE builds + - `nightly-versions.yaml` - These are versions used by the `ci/axis/nightly.yaml` for NIGHTLY builds + + Edit the files above and update the `VERSION_SPEC` as desired. + + For more information see the [Modifying Versions Files](#modifying-versions-files) From b793b757e7d53f4c00ec0058078067f13ce9b685 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 11:07:51 -0400 Subject: [PATCH 069/113] FIX Change how config files are loaded --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index e5bcfe4f..94256123 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -42,7 +42,7 @@ function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \ - --python=${PYTHON_VER} --append-file ${CONDA_CONFIG_FILE} ${1} + --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1} } function build_default_pkg { From 8564dae5632088c6dd28655fefb5686ba6332a2d Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 12:05:08 -0400 Subject: [PATCH 070/113] FIX Add missing = --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index b940f6ba..d3f83696 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -16,7 +16,7 @@ conda_version: conda_build_version: - '=3.18.11' conda_verify_version: - - '3.1.1' + - '=3.1.1' # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: From 3d2cbd65bd4799f9befb39d57e10dbeabd9d72fa Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 12:06:02 -0400 Subject: [PATCH 071/113] FIX Remove extra = --- 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 1568ca77..e326cccf 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -47,7 +47,7 @@ requirements: - cuml ={{ minor_version }}.* - cuspatial ={{ minor_version }}.* - dask-cuda ={{ minor_version }}.* - - dask-xgboost ={{ dask_xgboost_version }} + - dask-xgboost {{ dask_xgboost_version }} - nvstrings ={{ minor_version }}.* - rapids-xgboost ={{ minor_version }}.* - rmm ={{ minor_version }}.* From 80d0aabb72dd81e5010b0414490850030941b721 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 26 Mar 2020 12:09:08 -0400 Subject: [PATCH 072/113] FIX Add missing = --- conda/recipes/release-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index f1820adc..cb610a9e 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -16,7 +16,7 @@ conda_version: conda_build_version: - '=3.18.11' conda_verify_version: - - '3.1.1' + - '=3.1.1' # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: From b89c3f2f1a3b435257ab1c59d27b7421e0bec06b Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 27 Mar 2020 19:19:11 -0400 Subject: [PATCH 073/113] FIX Add upper limit for fsspec --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index d3f83696..73faea13 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -52,7 +52,7 @@ fastavro_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.3.3' + - '>=0.3.3,<0.7.0' gdal_version: - '=2.4.*' ipython_version: From 922b792b535df947332eac5c1bfa7e67cd553123 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 27 Mar 2020 19:20:42 -0400 Subject: [PATCH 074/113] FIX Add upper limit for fsspec --- conda/recipes/release-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index cb610a9e..09a53694 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -52,7 +52,7 @@ fastavro_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.3.3' + - '>=0.3.3,<0.7.0' gdal_version: - '=2.4.*' ipython_version: From 35c98189e850cdf28b728f8f2c6bc7e6fb1c4ab0 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 27 Mar 2020 19:25:39 -0400 Subject: [PATCH 075/113] FIX Update to exclude dev 0.7 --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 73faea13..19d340a9 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -52,7 +52,7 @@ fastavro_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.3.3,<0.7.0' + - '>=0.3.3,<0.7.0a0' gdal_version: - '=2.4.*' ipython_version: From 22bda765a2bda40ca30d9c1a092422784afcaa5a Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 27 Mar 2020 19:26:15 -0400 Subject: [PATCH 076/113] FIX Update to exclude dev 0.7 --- conda/recipes/release-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index 09a53694..f31d5d74 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -52,7 +52,7 @@ fastavro_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.3.3,<0.7.0' + - '>=0.3.3,<0.7.0a0' gdal_version: - '=2.4.*' ipython_version: From ebb2b01f2ab6ff18115195fc3ccf4712d00fc1c5 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Mon, 30 Mar 2020 18:28:30 -0400 Subject: [PATCH 077/113] ENH Match new fsspec version with cudf Will only use this for RAPIDS 0.14+ --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 19d340a9..193a7279 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -52,7 +52,7 @@ fastavro_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.3.3,<0.7.0a0' + - '>=0.6.0' gdal_version: - '=2.4.*' ipython_version: From 5926e8b67eb69d66fd5d7a84085669d7e2e39f37 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Mon, 30 Mar 2020 18:30:59 -0400 Subject: [PATCH 078/113] ENH Match new fsspec version with cudf --- conda/recipes/release-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index f31d5d74..6f68fb13 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -52,7 +52,7 @@ fastavro_version: flatbuffers_version: - '=1.10.0' fsspec_version: - - '>=0.3.3,<0.7.0a0' + - '>=0.6.0' gdal_version: - '=2.4.*' ipython_version: From 21dc6972ceff5113a44601d9772d3d18f51523e7 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Mon, 30 Mar 2020 18:33:13 -0400 Subject: [PATCH 079/113] ENH Update nightly version to just publish 0.14 --- ci/axis/nightly.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index 7ac794aa..ecd91cfa 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -5,7 +5,6 @@ CONDA_CONFIG_FILE: - conda/recipes/nightly-versions.yaml RAPIDS_VER: - - 0.13.0 - 0.14.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container From 3cc85993c1bc146a866f747be4e7bc767c15dafa Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Mon, 30 Mar 2020 18:33:30 -0400 Subject: [PATCH 080/113] ENH Update for the new release version 0.14 --- ci/axis/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index e2e94b39..efaf40fd 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -5,7 +5,7 @@ CONDA_CONFIG_FILE: - conda/recipes/release-versions.yaml RAPIDS_VER: - - 0.13.0 + - 0.14.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: From 908efcde89692fb8c47bbdac3fd035a10326fafa Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Mon, 30 Mar 2020 18:35:32 -0400 Subject: [PATCH 081/113] ENH Add cusignal to metapkg --- 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 e326cccf..98c07c7d 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -45,6 +45,7 @@ requirements: - cudf ={{ minor_version }}.* - cugraph ={{ minor_version }}.* - cuml ={{ minor_version }}.* + - cusignal ={{ minor_version }}.* - cuspatial ={{ minor_version }}.* - dask-cuda ={{ minor_version }}.* - dask-xgboost {{ dask_xgboost_version }} From 83b582800f95661f392e212e0428c6f2cab2a439 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Mon, 30 Mar 2020 18:45:01 -0400 Subject: [PATCH 082/113] ENH Add cuxfilter to rapids meta-pkg --- 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 e326cccf..44660b8b 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -46,6 +46,7 @@ requirements: - cugraph ={{ minor_version }}.* - cuml ={{ minor_version }}.* - cuspatial ={{ minor_version }}.* + - cuxfilter ={{ minor_version }}.* - dask-cuda ={{ minor_version }}.* - dask-xgboost {{ dask_xgboost_version }} - nvstrings ={{ minor_version }}.* From 93d6c98faa9a0ee53034de65998ce42bb57dc52e Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 31 Mar 2020 17:32:20 -0400 Subject: [PATCH 083/113] FIX Override conda channels for each build This way release builds will only pull packages from `rapidsai` and can alert us to missing packages sooner. Same for nightly builds. --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 94256123..1f059b73 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -41,7 +41,7 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." - conda build -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \ + conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \ --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1} } From aba4d821feacb08703a965d76705e9ce45a9069a Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 31 Mar 2020 17:41:38 -0400 Subject: [PATCH 084/113] FIX Add defaults channel due to override --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 1f059b73..a78c702a 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -41,7 +41,7 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." - conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge \ + conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge -c defaults \ --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1} } From 3f3676eb86c1ccf0b812a49c6d4927f205892b64 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Thu, 2 Apr 2020 10:27:14 -0400 Subject: [PATCH 085/113] Update xgboost nightly to 0.14 --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 193a7279..55cc2462 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -8,7 +8,7 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: - - '=1.0.2dev.rapidsai0.13' + - '=1.0.2dev.rapidsai0.14' # Versions for conda conda_version: From 84be100fea697f5ee02b8c6fb6f202895d6efd56 Mon Sep 17 00:00:00 2001 From: Shankara Rao Thejaswi Nanditale Date: Thu, 2 Apr 2020 20:28:50 -0700 Subject: [PATCH 086/113] replaced libclang with clang and clang-tools packages from conda-forge --- conda/recipes/nightly-versions.yaml | 4 ++-- conda/recipes/rapids-build-env/meta.yaml | 3 ++- conda/recipes/release-versions.yaml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 193a7279..5b358e2b 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -59,8 +59,8 @@ ipython_version: - '=7.3.*' jupyterlab_version: - '=1.2.*' -libclang_rapidsai_version: - - '=8.0.0' +clang_rapidsai_version: + - '=8' librdkafka_version: - '=1.2.2' nccl_version: diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index d9640147..a8c03877 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -66,7 +66,8 @@ requirements: - hypothesis - isort - lapack - - rapidsai::libclang {{ libclang_rapidsai_version }} + - conda-forge::clang {{ clang_rapidsai_version }} + - conda-forge::clang-tools {{ clang_rapidsai_version }} - libcumlprims ={{ minor_version }}.* - libcypher-parser - libgcc-ng {{ build_stack_version }} diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index 6f68fb13..b0bd45e8 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -59,8 +59,8 @@ ipython_version: - '=7.3.*' jupyterlab_version: - '=1.2.*' -libclang_rapidsai_version: - - '=8.0.0' +clang_rapidsai_version: + - '=8' librdkafka_version: - '=1.2.2' nccl_version: From 7ae3e6919dfea03fbe7a3a12738203ff13906040 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 3 Apr 2020 10:46:35 -0400 Subject: [PATCH 087/113] ENH Reorder and add minor wildcard --- conda/recipes/nightly-versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 5b358e2b..8f67dd2c 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -31,6 +31,8 @@ bokeh_version: - '=1.*' boost_cpp_version: - '=1.70.0' +clang_version: + - '=8.*' cmake_version: - '=3.14.5' cmake_setuptools_version: @@ -59,8 +61,6 @@ ipython_version: - '=7.3.*' jupyterlab_version: - '=1.2.*' -clang_rapidsai_version: - - '=8' librdkafka_version: - '=1.2.2' nccl_version: From 9183432ef8f76671af1880ddbca16016e0ccf81a Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 3 Apr 2020 10:47:18 -0400 Subject: [PATCH 088/113] ENH Reorder and add minor wildcard --- conda/recipes/release-versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index b0bd45e8..adfd134e 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -31,6 +31,8 @@ bokeh_version: - '=1.*' boost_cpp_version: - '=1.70.0' +clang_version: + - '=8.*' cmake_version: - '=3.14.5' cmake_setuptools_version: @@ -59,8 +61,6 @@ ipython_version: - '=7.3.*' jupyterlab_version: - '=1.2.*' -clang_rapidsai_version: - - '=8' librdkafka_version: - '=1.2.2' nccl_version: From c98749cd0a5b3d4e091f3dda3ccd551f41d1dda9 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Fri, 3 Apr 2020 10:48:16 -0400 Subject: [PATCH 089/113] ENH Reorder and match the new versioning name --- conda/recipes/rapids-build-env/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index a8c03877..87416aa7 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -41,6 +41,8 @@ requirements: - conda-forge::blas{{ blas_version }} - boost-cpp {{ boost_cpp_version }} - boto3 + - conda-forge::clang {{ clang_version }} + - conda-forge::clang-tools {{ clang_version }} - cmake {{ cmake_version }} - cmake_setuptools {{ cmake_setuptools_version }} - conda {{ conda_version }} @@ -66,8 +68,6 @@ requirements: - hypothesis - isort - lapack - - conda-forge::clang {{ clang_rapidsai_version }} - - conda-forge::clang-tools {{ clang_rapidsai_version }} - libcumlprims ={{ minor_version }}.* - libcypher-parser - libgcc-ng {{ build_stack_version }} From b3160732f2c068c805a23c37ad630e3e83f1be84 Mon Sep 17 00:00:00 2001 From: Shankara Rao Thejaswi Nanditale Date: Fri, 3 Apr 2020 20:51:05 -0700 Subject: [PATCH 090/113] ENH fixed clang version --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 8f67dd2c..bd307566 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -32,7 +32,7 @@ bokeh_version: boost_cpp_version: - '=1.70.0' clang_version: - - '=8.*' + - '=8.0.1' cmake_version: - '=3.14.5' cmake_setuptools_version: From 07c7cc4cfeac58976cbaa866663c8b4f6f1fc6fa Mon Sep 17 00:00:00 2001 From: Shankara Rao Thejaswi Nanditale Date: Fri, 3 Apr 2020 20:51:34 -0700 Subject: [PATCH 091/113] ENH fixed clang version --- conda/recipes/release-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index adfd134e..5bf193e9 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -32,7 +32,7 @@ bokeh_version: boost_cpp_version: - '=1.70.0' clang_version: - - '=8.*' + - '=8.0.1' cmake_version: - '=3.14.5' cmake_setuptools_version: From 31e56c9403fb416078cd191bfb90a5a2f41bb90a Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 23 Apr 2020 15:46:22 -0400 Subject: [PATCH 092/113] add pytest-timeout --- 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 87416aa7..42ff5b11 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -87,6 +87,7 @@ requirements: - pyarrow {{ arrow_version }} - pytest - pytest-cov + - pytest-timeout - python - rapidjson {{ rapidjson_version }} - ripgrep From 069dac5a07f50aa784da2acfa71a23b676616c02 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Fri, 24 Apr 2020 14:59:42 -0400 Subject: [PATCH 093/113] Bump dask version --- conda/recipes/nightly-versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index bd307566..e00d3d6f 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -42,9 +42,9 @@ cupy_version: cython_version: - '>=0.29,<0.30' dask_version: - - '>=2.12.0' + - '>=2.15.0' distributed_version: - - '>=2.12.0' + - '>=2.15.0' dlpack_version: - '=0.2' double_conversion_version: From 2209d9481d72e277f58212ff402a6a5b2c8e7d11 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 28 Apr 2020 11:52:02 -0400 Subject: [PATCH 094/113] ENH Match dask version --- conda/recipes/release-versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index 5bf193e9..1d4d0b71 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -42,9 +42,9 @@ cupy_version: cython_version: - '>=0.29,<0.30' dask_version: - - '>=2.12.0' + - '>=2.15.0' distributed_version: - - '>=2.12.0' + - '>=2.15.0' dlpack_version: - '=0.2' double_conversion_version: From ad821160681c0fb3ed2905c33d6b85f71e4b1522 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Wed, 29 Apr 2020 13:05:57 -0400 Subject: [PATCH 095/113] Add shellcheck --- 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 42ff5b11..13d2f1e3 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -95,6 +95,7 @@ requirements: - setuptools - scikit-learn {{ scikit_learn_version }} - scipy {{ scipy_version }} + - shellcheck - statsmodels - streamz - twine From d1dd7221f266b818a342efbb15711e1c4d6c9ea6 Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Thu, 30 Apr 2020 16:44:59 +0100 Subject: [PATCH 096/113] Bump Numba version to 0.49 This changes the Numba version to be at least 0.49. The previous version specification, >=0.48,<0.49 was due to API changes in Numba 0.49 that could have affected RAPIDS libraries - I have tested current versions of cuDF, Dask-cuDF, cuGraph, cuSpatial, and cuML with 0.49 without any issues relating to the changes in version 0.49 of Numba. There are no backwards-incompatible changes planned for Numba 0.50 (for non-deprecated functionality), and no deprecated Numba features are used by RAPIDS as far as I am aware - hence, I think it is appropriate to also allow versions of Numba > 0.49. --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 222bcf0f..456fab03 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -68,7 +68,7 @@ nccl_version: networkx_version: - '>=2.3' numba_version: - - '>=0.48,<0.49' + - '>=0.49' numpy_version: - '>=1.17.3' pandas_version: From a7c16b3c45dbee38fd65b16d4a13e3a5fc8b160f Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Mon, 11 May 2020 15:25:50 +0100 Subject: [PATCH 097/113] Bump Numba version to 0.49.1 --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 456fab03..b50007dd 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -68,7 +68,7 @@ nccl_version: networkx_version: - '>=2.3' numba_version: - - '>=0.49' + - '>=0.49.1' numpy_version: - '>=1.17.3' pandas_version: From f9c5f5a55f7b465ccfec5ebc14a107448028e80c Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Tue, 12 May 2020 15:15:07 +0100 Subject: [PATCH 098/113] Use numba channel for Numba 0.49.1 --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index a78c702a..d304eb9f 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -41,7 +41,7 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." - conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge -c defaults \ + conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge -c numba -c defaults \ --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1} } From 054262c14526d147c6b6eff25a99370f539803e7 Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Tue, 12 May 2020 17:45:11 +0100 Subject: [PATCH 099/113] Revert "Use numba channel for Numba 0.49.1" This reverts commit f9c5f5a55f7b465ccfec5ebc14a107448028e80c. --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index d304eb9f..a78c702a 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -41,7 +41,7 @@ conda list --show-channel-urls function build_pkg { # Build pkg gpuci_logger "Start conda build for '${1}'..." - conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge -c numba -c defaults \ + conda build --override-channels -c ${CONDA_USERNAME:-rapidsai-nightly} -c nvidia -c conda-forge -c defaults \ --python=${PYTHON_VER} -m ${CONDA_CONFIG_FILE} ${1} } From e192b513a371672e8d035f45baae31cada42ad57 Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Tue, 12 May 2020 17:45:22 +0100 Subject: [PATCH 100/113] Revert "Bump Numba version to 0.49.1" This reverts commit a7c16b3c45dbee38fd65b16d4a13e3a5fc8b160f. --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index b50007dd..456fab03 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -68,7 +68,7 @@ nccl_version: networkx_version: - '>=2.3' numba_version: - - '>=0.49.1' + - '>=0.49' numpy_version: - '>=1.17.3' pandas_version: From 2a6272727f483695ed686319ef4125c5e5efe238 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Tue, 19 May 2020 21:05:48 -0500 Subject: [PATCH 101/113] Add sphinx-copybutton for docs --- conda/recipes/rapids-doc-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 1f02cab3..770ef1c1 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -47,6 +47,7 @@ requirements: - sphinx - sphinx_rtd_theme - sphinxcontrib-websupport + - sphinx-copybutton about: home: http://rapids.ai/ From 7fc4faae583adf7cbaf46f4da8655bceec1304c3 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 20 May 2020 07:47:23 -0700 Subject: [PATCH 102/113] Add psutil to rapids build env --- 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 13d2f1e3..8b5d35d9 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -84,6 +84,7 @@ requirements: - numpy {{ numpy_version }} - pandas {{ pandas_version }} - protobuf {{ protobuf_version }} + - psutil - pyarrow {{ arrow_version }} - pytest - pytest-cov From a63b93f1c1e470fb126c95bb7dc7c698d74472bd Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Tue, 26 May 2020 19:32:16 -0400 Subject: [PATCH 103/113] ENH Add v0.15 to nightly --- ci/axis/nightly.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index ecd91cfa..20060b6f 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -6,6 +6,7 @@ CONDA_CONFIG_FILE: RAPIDS_VER: - 0.14.0 + - 0.15.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: From f2d3fe8b96adb89177218110fcd211c31755a15f Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Wed, 27 May 2020 14:49:39 -0400 Subject: [PATCH 104/113] Update nightly-versions.yaml --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 456fab03..c6b18d7e 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -8,7 +8,7 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: - - '=1.0.2dev.rapidsai0.14' + - '=1.1.0dev.rapidsai0.14' # Versions for conda conda_version: From 34273e82b8518e3cbe716a46b1b2649a56ea990a Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 28 May 2020 17:38:23 -0400 Subject: [PATCH 105/113] FIX Update gdal version for cuspatial Refs rapidsai/cuspatial#214 --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index c6b18d7e..5e6e69e8 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -56,7 +56,7 @@ flatbuffers_version: fsspec_version: - '>=0.6.0' gdal_version: - - '=2.4.*' + - '>=3.0.2' ipython_version: - '=7.3.*' jupyterlab_version: From 2ad3e49950fc0192e7a8548324f1f1468b53c0c1 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 28 May 2020 17:39:54 -0400 Subject: [PATCH 106/113] FIX Update gdal version for cuspatial Refs rapidsai/cuspatial#214 --- conda/recipes/release-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index 1d4d0b71..efe7d58c 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -56,7 +56,7 @@ flatbuffers_version: fsspec_version: - '>=0.6.0' gdal_version: - - '=2.4.*' + - '>=3.0.2' ipython_version: - '=7.3.*' jupyterlab_version: From c640354da5852f532e2677d98347482a8addb583 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Thu, 28 May 2020 14:41:41 -0700 Subject: [PATCH 107/113] Update gdal version for cuspatial --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index c6b18d7e..5e6e69e8 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -56,7 +56,7 @@ flatbuffers_version: fsspec_version: - '>=0.6.0' gdal_version: - - '=2.4.*' + - '>=3.0.2' ipython_version: - '=7.3.*' jupyterlab_version: From c49cf28bf1b6edb66e039eea57101b0916203d30 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 1 Jun 2020 10:09:45 -0400 Subject: [PATCH 108/113] add customization dependencies --- conda/recipes/rapids-doc-env/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 770ef1c1..00fa3c16 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -6,14 +6,14 @@ {% set cuda_version = '.'.join(environ.get('CUDA_VERSION', '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 +# gpuCI loads the correct file based on the build type (NIGHTLY or RELEASE) in # `ci/cpu/build.sh` and `ci/axis/*.yaml` # -# Manual builds need to use the `conda build` flag of `-m .yaml` +# Manual builds need to use the `conda build` flag of `-m .yaml` # to set these versions ### @@ -39,7 +39,9 @@ requirements: - python - pip run: + - beautifulsoup4 - doxygen + - jq - nbsphinx - numpydoc - pandoc {{ pandoc_version }} From 8147c6c58d894042f84e9d56db98600ee3ad2799 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 1 Jun 2020 07:59:23 -0700 Subject: [PATCH 109/113] Add markdown package to doc dependencies --- conda/recipes/rapids-doc-env/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/rapids-doc-env/meta.yaml b/conda/recipes/rapids-doc-env/meta.yaml index 770ef1c1..516f4165 100644 --- a/conda/recipes/rapids-doc-env/meta.yaml +++ b/conda/recipes/rapids-doc-env/meta.yaml @@ -40,6 +40,7 @@ requirements: - pip run: - doxygen + - markdown - nbsphinx - numpydoc - pandoc {{ pandoc_version }} From 571054bcd4b1350d0c98bb602aa8d66a85308e48 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Tue, 2 Jun 2020 15:13:58 -0400 Subject: [PATCH 110/113] Update scikit version --- conda/recipes/nightly-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index 5e6e69e8..cf2c70d8 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -80,6 +80,6 @@ protobuf_version: rapidjson_version: - '=1.1.0' scikit_learn_version: - - '=0.21.3' + - '=0.23.1' scipy_version: - '=1.3.0' From 08011182b9588cbc6575940bf7cd80574b981623 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 3 Jun 2020 09:25:45 -0700 Subject: [PATCH 111/113] Update scikit learn for cugrapht testing --- conda/recipes/nightly-versions.yaml | 2 +- conda/recipes/release-versions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/nightly-versions.yaml b/conda/recipes/nightly-versions.yaml index cf2c70d8..3ad65a42 100644 --- a/conda/recipes/nightly-versions.yaml +++ b/conda/recipes/nightly-versions.yaml @@ -80,6 +80,6 @@ protobuf_version: rapidjson_version: - '=1.1.0' scikit_learn_version: - - '=0.23.1' + - '=0.23.0' scipy_version: - '=1.3.0' diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index efe7d58c..3cc25b48 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -80,6 +80,6 @@ protobuf_version: rapidjson_version: - '=1.1.0' scikit_learn_version: - - '=0.21.3' + - '=0.23.0' scipy_version: - '=1.3.0' From 3ddd17bc788c2251435954ae7276b964cdca4e52 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 3 Jun 2020 15:40:18 -0400 Subject: [PATCH 112/113] ENH Update release versions for v0.14 release Pin numba to 0.49 to prevent issues with future numba releases --- conda/recipes/release-versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/release-versions.yaml b/conda/recipes/release-versions.yaml index 3cc25b48..0d3859df 100644 --- a/conda/recipes/release-versions.yaml +++ b/conda/recipes/release-versions.yaml @@ -8,7 +8,7 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: - - '=1.0.2dev.rapidsai0.13' + - '=1.1.0dev.rapidsai0.14' # Versions for conda conda_version: @@ -68,7 +68,7 @@ nccl_version: networkx_version: - '>=2.3' numba_version: - - '>=0.48,<0.49' + - '>=0.49,<0.50a' numpy_version: - '>=1.17.3' pandas_version: From 390c5de74fa409cf201fa704d94a674741eeba37 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Wed, 3 Jun 2020 15:43:10 -0400 Subject: [PATCH 113/113] ENH Drop 0.14 from nightly builds --- ci/axis/nightly.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index 20060b6f..9fe656a1 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -5,7 +5,6 @@ CONDA_CONFIG_FILE: - conda/recipes/nightly-versions.yaml RAPIDS_VER: - - 0.14.0 - 0.15.0 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container