diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 79691253..38ce1044 100644 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -1,6 +1,5 @@ - #!/usr/bin/env bash -# Copyright (c) 2018-2020, NVIDIA CORPORATION. +# Copyright (c) 2018-2022, NVIDIA CORPORATION. ############################################# # cuSignal's Benchmark test script for CI # ############################################# @@ -57,7 +56,7 @@ gpuci_logger "Activate conda env" conda activate rapids gpuci_logger "Install required packages" -gpuci_conda_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge \ +gpuci_mamba_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge \ "cudatoolkit=$CUDA_REL" \ "rapids-build-env=${MINOR_VERSION}" \ rapids-pytest-benchmark @@ -110,4 +109,4 @@ time pytest ../python -k TestWavelets -v -m "not cpu" \ --benchmark-asv-output-dir="${S3_ASV_DIR}" \ --benchmark-asv-metadata="${BENCHMARK_META}" -EXITCODE=$? \ No newline at end of file +EXITCODE=$? diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 29b5b0d0..d1f06768 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2022, NVIDIA CORPORATION. ########################################## # cuSignal CPU conda build script for CI # ########################################## @@ -52,6 +52,9 @@ conda list --show-channel-urls # FIX Added to deal with Anancoda SSL verification issues during conda builds conda config --set ssl_verify False +# FIXME: Remove +gpuci_mamba_retry install -c conda-forge boa + ################################################################################ # BUILD - Conda package build ################################################################################ @@ -61,7 +64,7 @@ export GPUCI_CONDA_RETRY_MAX=1 export GPUCI_CONDA_RETRY_SLEEP=30 gpuci_logger "Build conda pkg for cuSignal" -gpuci_conda_retry build conda/recipes/cusignal --python=${PYTHON} +gpuci_conda_retry mambabuild conda/recipes/cusignal --python=${PYTHON} ################################################################################ # UPLOAD - Conda packages diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 2aef7423..3ff2d88b 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2018-2020, NVIDIA CORPORATION. +# Copyright (c) 2018-2022, NVIDIA CORPORATION. ############################################# # cuSignal GPU build and test script for CI # ############################################# @@ -54,10 +54,13 @@ conda list --show-channel-urls # BUILD - Build cusignal ################################################################################ +# TODO: Move boa install to gpuci/rapidsai +gpuci_mamba_retry install boa + gpuci_logger "Build and install cusignal" cd "${WORKSPACE}" CONDA_BLD_DIR="${WORKSPACE}/.conda-bld" -gpuci_conda_retry build --croot "${CONDA_BLD_DIR}" conda/recipes/cusignal --python=${PYTHON} +gpuci_conda_retry mambabuild --croot "${CONDA_BLD_DIR}" conda/recipes/cusignal --python=${PYTHON} gpuci_mamba_retry install -c "${CONDA_BLD_DIR}" cusignal ################################################################################