From d0b4ba89ac87c01cc72c86004df003fcb033c245 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Tue, 25 Jan 2022 11:34:35 +0100 Subject: [PATCH 1/3] Fix packages upload Signed-off-by: Jordan Jacobelli --- ci/cpu/build.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 36d22e523d..18569316d5 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2018-2021, NVIDIA CORPORATION. +# Copyright (c) 2018-2022, NVIDIA CORPORATION. ############################################## # cuML CPU conda build script for CI # ############################################## @@ -83,9 +83,8 @@ else if [ "$BUILD_LIBCUML" == '1' ]; then gpuci_logger "PROJECT FLASH: Build conda pkg for libcuml" gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuml --dirty --no-remove-work-dir - mkdir -p ${CONDA_BLD_DIR}/libcuml/work - cp -r ${CONDA_BLD_DIR}/work/* ${CONDA_BLD_DIR}/libcuml/work - rm -rf ${CONDA_BLD_DIR}/work + mkdir -p ${CONDA_BLD_DIR}/libcuml + mv ${CONDA_BLD_DIR}/work/ ${CONDA_BLD_DIR}/libcuml/work fi fi @@ -96,9 +95,8 @@ if [ "$BUILD_CUML" == '1' ]; then else gpuci_logger "PROJECT FLASH: Build conda pkg for cuml" gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/cuml -c $CONDA_BLD_DIR --dirty --no-remove-work-dir --python=${PYTHON} - mkdir -p ${CONDA_BLD_DIR}/cuml/work - cp -r ${CONDA_BLD_DIR}/work/* ${CONDA_BLD_DIR}/cuml/work - rm -rf ${CONDA_BLD_DIR}/work + mkdir -p ${CONDA_BLD_DIR}/cuml + mv ${CONDA_BLD_DIR}/work/ ${CONDA_BLD_DIR}/cuml/work fi fi From 9aad3501b0d336de82afb148d6776044c8fea43e Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Wed, 26 Jan 2022 18:36:20 +0100 Subject: [PATCH 2/3] Only build cpp code when needed Signed-off-by: Jordan Jacobelli --- ci/cpu/build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 18569316d5..d42aca6dd1 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -63,12 +63,14 @@ conda list --show-channel-urls # FIX Added to deal with Anancoda SSL verification issues during conda builds conda config --set ssl_verify False -# FIXME: for now, force the building of all packages so they are built on a +# Build python package in CUDA jobs so they are built on a # machine with a single CUDA version, then have the gpu/build.sh script simply # install. This should eliminate a mismatch between different CUDA versions on # cpu vs. gpu builds that is problematic with CUDA 11.5 Enhanced Compat. -BUILD_LIBCUML=1 -BUILD_CUML=1 +if [ "$BUILD_LIBCUML" == '1' ]; then + echo "BUILD_LIBCUML=1: Setting BUILD_CUML to 1..." + BUILD_CUML=1 +fi ################################################################################ # BUILD - Conda package builds (conda deps: libcuml <- cuml) From 783f0345fb8462f6febb7146139f9430dd752152 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Thu, 27 Jan 2022 11:07:29 +0100 Subject: [PATCH 3/3] Fix local channel path in CI Signed-off-by: Jordan Jacobelli --- ci/cpu/build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index d42aca6dd1..0c25a0ee18 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -70,6 +70,11 @@ conda config --set ssl_verify False if [ "$BUILD_LIBCUML" == '1' ]; then echo "BUILD_LIBCUML=1: Setting BUILD_CUML to 1..." BUILD_CUML=1 + # If we are doing CUDA + Python builds, libcuml package is located at ${CONDA_BLD_DIR} + CONDA_LOCAL_CHANNEL="${CONDA_BLD_DIR}" +else + # If we are doing Python builds only, libcuml package is placed here by Project Flash + CONDA_LOCAL_CHANNEL="ci/artifacts/cuml/cpu/.conda-bld/" fi ################################################################################ @@ -96,7 +101,7 @@ if [ "$BUILD_CUML" == '1' ]; then gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cuml --python=${PYTHON} else gpuci_logger "PROJECT FLASH: Build conda pkg for cuml" - gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/cuml -c $CONDA_BLD_DIR --dirty --no-remove-work-dir --python=${PYTHON} + gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/cuml -c ${CONDA_LOCAL_CHANNEL} --dirty --no-remove-work-dir --python=${PYTHON} mkdir -p ${CONDA_BLD_DIR}/cuml mv ${CONDA_BLD_DIR}/work/ ${CONDA_BLD_DIR}/cuml/work fi @@ -108,4 +113,3 @@ fi gpuci_logger "Upload conda pkgs" source ci/cpu/upload.sh -