From 5a99d2f9d7baec056dc168493650004c4e23dd8f Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Thu, 14 Jan 2021 18:13:27 -0600 Subject: [PATCH 1/4] FIX Update cupy to >= 7.8 and remove unused build.sh script --- ci/mg/build.sh | 96 ------------------------------------ conda/recipes/cuml/meta.yaml | 2 +- python/README.md | 2 +- 3 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 ci/mg/build.sh diff --git a/ci/mg/build.sh b/ci/mg/build.sh deleted file mode 100644 index 9f742edb52..0000000000 --- a/ci/mg/build.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash -# Copyright (c) 2018-2019, NVIDIA CORPORATION. -######################################### -# cuML GPU build and test script for CI # -######################################### -set -e -NUMARGS=$# -ARGS=$* - -# Logger function for build status output -function logger() { - echo -e "\n>>>> $@\n" -} - -# Arg parsing function -function hasArg { - (( ${NUMARGS} != 0 )) && (echo " ${ARGS} " | grep -q " $1 ") -} - -# Set path and build parallel level -export PATH=/conda/bin:/usr/local/cuda/bin:$PATH -export PARALLEL_LEVEL=4 -export CUDA_REL=${CUDA_VERSION%.*} - -# Parse git describe -cd $WORKSPACE -export GIT_DESCRIBE_TAG=`git describe --tags` -export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` - -# Set home to the job's workspace -export HOME=$WORKSPACE - -################################################################################ -# SETUP - Check environment -################################################################################ - -logger "Check environment..." -env - -logger "Check GPU usage..." -nvidia-smi - -logger "Activate conda env..." -source activate gdf -conda install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia \ - "cupy>7.1.0,<9.0.0a0" \ - "cudatoolkit=${CUDA_REL}" \ - "cudf=${MINOR_VERSION}" \ - "rmm=${MINOR_VERSION}" \ - "libcumlprims=${MINOR_VERSION}" \ - "lapack" \ - "cmake==3.14.3" \ - "umap-learn" \ - "nccl>=2.5" \ - "dask>=2.12.0" \ - "distributed>=2.12.0" \ - "dask-cudf=${MINOR_VERSION}" \ - "dask-cuda=${MINOR_VERSION}" \ - "ucx-py=${MINOR_VERSION}" \ - "statsmodels" \ - "xgboost==1.1.0dev.rapidsai0.15" \ - "lightgbm" - -logger "Check versions..." -python --version -$CC --version -$CXX --version -conda list - -################################################################################ -# BUILD - Build libcuml++, cuML, and prims from source -################################################################################ - -logger "Build libcuml++..." -$WORKSPACE/build.sh clean libcuml cuml prims bench -v - -################################################################################ -# TEST - Run MG GoogleTest and py.tests for libcuml++ and cuML -################################################################################ - -if hasArg --skip-tests; then - logger "Skipping Tests..." - exit 0 -fi - -logger "Check GPU usage..." -nvidia-smi - -# Disabled while CI/the test become compatible -# logger "MG GoogleTest for libcuml mg..." -# cd $WORKSPACE/cpp/build -# GTEST_OUTPUT="xml:${WORKSPACE}/test-results/libcuml_cpp_mg/" ./test/ml_mg - -logger "Python MG pytest for cuml..." -cd $WORKSPACE/python -pytest --cache-clear --junitxml=${WORKSPACE}/junit-cuml.xml -v -m "mg" diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index c849f87dd2..58c90761cb 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -41,7 +41,7 @@ requirements: - libcuml={{ version }} - libcumlprims {{ minor_version }} - treelite=1.0.0rc1 - - cupy>7.1.0,<9.0.0a0 + - cupy>=7.8.0,<9.0.0a0 - nccl>=2.5 - ucx-py {{ minor_version }} - dask>=2.12.0 diff --git a/python/README.md b/python/README.md index 033913c62f..d7ca39ea10 100644 --- a/python/README.md +++ b/python/README.md @@ -62,7 +62,7 @@ To build cuML's Python package, the following dependencies are required: - cudf version matching the cuML version - libcuml version matching the cuML version - libcuml={{ version }} -- cupy>7.1.0,<9.0.0a0 +- cupy>=7.8.0,<9.0.0a0 - joblib >=0.11 Packages required for multigpu algorithms*: From 92a72e537ef1c390f5a32dea58daa320f6446820 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Sun, 24 Jan 2021 10:20:00 -0600 Subject: [PATCH 2/4] FIX Copyright year --- conda/recipes/cuml/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 58c90761cb..01abd87744 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2018-2021, NVIDIA CORPORATION. # Usage: # conda build . -c defaults -c conda-forge -c numba -c rapidsai -c pytorch From bc5884e0d2924acfac2817beff811552137c0321 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Mon, 1 Feb 2021 10:45:51 -0600 Subject: [PATCH 3/4] FIX Copyright year --- conda/recipes/libcuml/meta.yaml | 2 +- python/cuml/test/test_kmeans.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index 2a12a3a990..57c008ee43 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2018-2021, NVIDIA CORPORATION. # Usage: # conda build . -c defaults -c conda-forge -c nvidia -c rapidsai -c pytorch diff --git a/python/cuml/test/test_kmeans.py b/python/cuml/test/test_kmeans.py index 43f0f4a1d6..465be1eb1d 100644 --- a/python/cuml/test/test_kmeans.py +++ b/python/cuml/test/test_kmeans.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2021, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 346141f5a92b84d4a0332be6d373b75380097dea Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Mon, 1 Feb 2021 11:28:25 -0600 Subject: [PATCH 4/4] FIX Copyright year --- python/cuml/test/test_kmeans.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cuml/test/test_kmeans.py b/python/cuml/test/test_kmeans.py index 465be1eb1d..43f0f4a1d6 100644 --- a/python/cuml/test/test_kmeans.py +++ b/python/cuml/test/test_kmeans.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021, NVIDIA CORPORATION. +# Copyright (c) 2019-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.