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 f51de8f0b9..1dfee67233 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2018-2021, NVIDIA CORPORATION. # Usage: # conda build . -c defaults -c conda-forge -c numba -c rapidsai -c pytorch @@ -40,8 +40,8 @@ requirements: - dask-cudf {{ minor_version }} - libcuml={{ version }} - libcumlprims {{ minor_version }} + - cupy>=7.8.0,<9.0.0a0 - treelite=1.0.0 - - cupy>7.1.0,<9.0.0a0 - nccl>=2.5 - ucx-py {{ minor_version }} - dask>=2.12.0 diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml index a2d62f0072..39eab1e8a2 100644 --- a/conda/recipes/libcuml/meta.yaml +++ b/conda/recipes/libcuml/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021, 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/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*: