diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index e3badfdef..6f99d44b0 100644 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -23,8 +23,9 @@ export CUDA_REL=${CUDA_VERSION%.*} export GPUCI_CONDA_RETRY_MAX=1 export GPUCI_CONDA_RETRY_SLEEP=30 -# Use Ninja to build +# Use Ninja to build, setup conda build dir export CMAKE_GENERATOR="Ninja" +export CONDA_BLD_DIR="${WORKSPACE}/.conda-bld" # Switch to project root; also root of repo checkout cd $WORKSPACE @@ -69,19 +70,21 @@ conda config --set ssl_verify False if [ "$BUILD_LIBCUSPATIAL" == '1' ]; then gpuci_logger "Build conda pkg for libcuspatial" if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then - gpuci_conda_retry build conda/recipes/libcuspatial + gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuspatial else - gpuci_conda_retry build --dirty --no-remove-work-dir conda/recipes/libcuspatial + gpuci_conda_retry build --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 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 conda/recipes/cuspatial + gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cuspatial else - gpuci_conda_retry build --dirty --no-remove-work-dir \ - -c $WORKSPACE/ci/artifacts/cuspatial/cpu/conda-bld/ conda/recipes/cuspatial + gpuci_conda_retry build --croot ${CONDA_BLD_DIR} --dirty --no-remove-work-dir \ + -c $WORKSPACE/ci/artifacts/cuspatial/cpu/.conda-bld/ conda/recipes/cuspatial fi fi diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh index ecc61a05b..e11cdd942 100644 --- a/ci/cpu/upload.sh +++ b/ci/cpu/upload.sh @@ -26,8 +26,8 @@ fi ################################################################################ gpuci_logger "Get conda file output locations" -export LIBCUSPATIAL_FILE=`conda build conda/recipes/libcuspatial --output` -export CUSPATIAL_FILE=`conda build conda/recipes/cuspatial --python=$PYTHON --output` +export LIBCUSPATIAL_FILE=`conda build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuspatial --output` +export CUSPATIAL_FILE=`conda build --croot ${CONDA_BLD_DIR} conda/recipes/cuspatial --python=$PYTHON --output` ################################################################################ # UPLOAD - Conda packages diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 53f0e7ccd..ad5b2645d 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -18,6 +18,7 @@ export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4} export CUDA_REL=${CUDA_VERSION%.*} export CUDF_HOME="${WORKSPACE}/cudf" export CUSPATIAL_HOME="${WORKSPACE}" +export CONDA_ARTIFACT_PATH=${WORKSPACE}/ci/artifacts/cuspatial/cpu/.conda-bld/ # Set home to the job's workspace export HOME=$WORKSPACE @@ -130,11 +131,11 @@ else cd $WORKSPACE/python - CONDA_FILE=`find $WORKSPACE/ci/artifacts/cuspatial/cpu/conda-bld/ -name "libcuspatial*.tar.bz2"` + CONDA_FILE=`find ${CONDA_ARTIFACT_PATH} -name "libcuspatial*.tar.bz2"` CONDA_FILE=`basename "$CONDA_FILE" .tar.bz2` #get filename without extension CONDA_FILE=${CONDA_FILE//-/=} #convert to conda install gpuci_logger "Installing $CONDA_FILE" - conda install -c $WORKSPACE/ci/artifacts/cuspatial/cpu/conda-bld/ "$CONDA_FILE" + conda install -c ${CONDA_ARTIFACT_PATH} "$CONDA_FILE" export LIBCUGRAPH_BUILD_DIR="$WORKSPACE/ci/artifacts/cuspatial/cpu/conda_work/build" diff --git a/conda/recipes/libcuspatial/meta.yaml b/conda/recipes/libcuspatial/meta.yaml index 29ea18fcd..f9b6311f2 100644 --- a/conda/recipes/libcuspatial/meta.yaml +++ b/conda/recipes/libcuspatial/meta.yaml @@ -9,7 +9,7 @@ package: version: {{ version }} source: - path: ../../.. + git_url: ../../.. build: number: {{ GIT_DESCRIBE_NUMBER }}