Skip to content

Commit

Permalink
Build packages using mambabuild (#486)
Browse files Browse the repository at this point in the history
Use `mambabuild` to build `conda` packages. This should speed up the builds and help to debug `conda` conflict issues

Authors:
  - Jordan Jacobelli (https://github.com/Ethyling)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: #486
  • Loading branch information
jjacobelli authored May 24, 2022
1 parent 4f0c473 commit 700ac12
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
13 changes: 8 additions & 5 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018-2021, NVIDIA CORPORATION.
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
######################################
# cuSpatial CPU conda build script for CI #
######################################
Expand Down Expand Up @@ -68,16 +68,19 @@ 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 builds (conda deps: libcupatial <- cuspatial)
##########################################################################################

if [ "$BUILD_LIBCUSPATIAL" == '1' ]; then
gpuci_logger "Build conda pkg for libcuspatial"
if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuspatial
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuspatial
else
gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} --dirty --no-remove-work-dir conda/recipes/libcuspatial
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} --dirty --no-remove-work-dir conda/recipes/libcuspatial
mkdir -p ${CONDA_BLD_DIR}/libcuspatial/work
cp -r ${CONDA_BLD_DIR}/work/* ${CONDA_BLD_DIR}/libcuspatial/work
fi
Expand All @@ -88,9 +91,9 @@ fi
if [ "$BUILD_CUSPATIAL" == '1' ]; then
gpuci_logger "Build conda pkg for cuspatial"
if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cuspatial
gpuci_conda_retry mambabuild --croot ${CONDA_BLD_DIR} conda/recipes/cuspatial
else
gpuci_conda_retry build --croot "$CONDA_BLD_DIR" --dirty --no-remove-work-dir \
gpuci_conda_retry mambabuild --croot "$CONDA_BLD_DIR" --dirty --no-remove-work-dir \
-c "$WORKSPACE/ci/artifacts/cuspatial/cpu/.conda-bld/" conda/recipes/cuspatial
fi
fi
Expand Down
7 changes: 5 additions & 2 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# COPYRIGHT (c) 2020, NVIDIA CORPORATION.
# COPYRIGHT (c) 2020-2022, NVIDIA CORPORATION.
#########################################
# cuSpatial GPU build and test script for CI #
#########################################
Expand Down Expand Up @@ -119,10 +119,13 @@ else
gpuci_logger "Installing libcuspatial and libcuspatial-tests"
gpuci_mamba_retry install -c "${CONDA_ARTIFACT_PATH}" libcuspatial libcuspatial-tests

# TODO: Move boa install to gpuci/rapidsai
gpuci_mamba_retry install boa

gpuci_logger "Building and installing cuspatial"
export CONDA_BLD_DIR="${WORKSPACE}/.conda-bld"
export VERSION_SUFFIX=""
gpuci_conda_retry build --croot "${CONDA_BLD_DIR}" -c "${CONDA_ARTIFACT_PATH}" -c "${CONDA_BLD_DIR}" conda/recipes/cuspatial
gpuci_conda_retry mambabuild --croot "${CONDA_BLD_DIR}" -c "${CONDA_ARTIFACT_PATH}" -c "${CONDA_BLD_DIR}" conda/recipes/cuspatial
gpuci_mamba_retry install -c "${CONDA_BLD_DIR}" -c "${CONDA_ARTIFACT_PATH}" cuspatial

gpuci_logger "Running googletests"
Expand Down

0 comments on commit 700ac12

Please sign in to comment.