From aa6d66d2e8b530e581b654ceceda80f1a04a4828 Mon Sep 17 00:00:00 2001
From: Jordan Jacobelli <jjacobelli@nvidia.com>
Date: Tue, 19 Apr 2022 09:13:35 +0200
Subject: [PATCH] Use conda to build python packages during GPU tests
Signed-off-by: Jordan Jacobelli <jjacobelli@nvidia.com>
---
ci/gpu/build.sh | 28 ++++++++++++--------
python/cuspatial/cuspatial/tests/__init__.py | 0
2 files changed, 17 insertions(+), 11 deletions(-)
delete mode 100644 python/cuspatial/cuspatial/tests/__init__.py
diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index b1164669a..52733849f 100644
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -27,6 +27,7 @@ export HOME="$WORKSPACE"
cd "$WORKSPACE"
export GIT_DESCRIBE_TAG=`git describe --tags`
export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
+unset GIT_DESCRIBE_TAG
################################################################################
# SETUP - Check environment
@@ -41,12 +42,6 @@ nvidia-smi
gpuci_logger "Activate conda env"
. /opt/conda/etc/profile.d/conda.sh
conda activate rapids
-gpuci_mamba_retry install "cudf=${MINOR_VERSION}.*" "cudatoolkit=$CUDA_REL" \
- "rapids-build-env=$MINOR_VERSION.*"
-
-# https://docs.rapids.ai/maintainers/depmgmt/
-# gpuci_mamba_retry remove --force rapids-build-env
-# gpuci_mamba_retry install "your-pkg=1.0.0"
gpuci_logger "Check versions"
python --version
@@ -66,11 +61,19 @@ gpuci_logger "Clone cudf"
git clone https://github.com/rapidsai/cudf.git -b branch-$MINOR_VERSION ${CUDF_HOME}
cd $CUDF_HOME
git submodule update --init --remote --recursive
+cd "${WORKSPACE}"
if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
################################################################################
# BUILD - Build libcuspatial and cuSpatial from source
################################################################################
+ gpuci_mamba_retry install "cudf=${MINOR_VERSION}.*" \
+ "cudatoolkit=$CUDA_REL" \
+ "rapids-build-env=$MINOR_VERSION.*"
+
+ # https://docs.rapids.ai/maintainers/depmgmt/
+ # gpuci_mamba_retry remove --force rapids-build-env
+ # gpuci_mamba_retry install "your-pkg=1.0.0"
gpuci_logger "Build cuSpatial"
cd "$WORKSPACE"
@@ -113,8 +116,15 @@ else
gpuci_logger "Check GPU usage"
nvidia-smi
+ gpuci_logger "Installing libcuspatial and libcuspatial-tests"
gpuci_mamba_retry install -c "${CONDA_ARTIFACT_PATH}" libcuspatial libcuspatial-tests
+ 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_mamba_retry install -c "${CONDA_BLD_DIR}" -c "${CONDA_ARTIFACT_PATH}" cuspatial
+
gpuci_logger "Running googletests"
for gt in "${CONDA_PREFIX}/bin/gtests/libcuspatial/"*; do
test_name=$(basename ${gt})
@@ -127,12 +137,8 @@ else
fi
done
- cd "$WORKSPACE/python"
-
- gpuci_logger "Building cuspatial"
- "$WORKSPACE/build.sh" -v cuspatial
-
gpuci_logger "Run pytests"
+ cd "$WORKSPACE/python/cuspatial/cuspatial"
py.test --cache-clear --junitxml="$WORKSPACE/junit-cuspatial.xml" -v
EXITCODE=$?
diff --git a/python/cuspatial/cuspatial/tests/__init__.py b/python/cuspatial/cuspatial/tests/__init__.py
deleted file mode 100644
index e69de29bb..000000000