From 94ae3682eac2eddb35e7f8dc7c20e208357eec2f Mon Sep 17 00:00:00 2001
From: AJ Schmidt <aschmidt@nvidia.com>
Date: Tue, 15 Feb 2022 09:44:42 -0500
Subject: [PATCH] update ci/gpu/build.sh to use librmm_tests pkg

---
 ci/gpu/build.sh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index 8a7a94e22..8e80cc8e1 100755
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -32,10 +32,6 @@ export GIT_DESCRIBE_TAG=`git describe --abbrev=0 --tags`
 export GIT_DESCRIBE_NUMBER=`git rev-list ${GIT_DESCRIBE_TAG}..HEAD --count`
 export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
 
-# Set sccache as CMake compiler
-export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"
-export CMAKE_CXX_COMPILER_LAUNCHER="sccache"
-export CMAKE_C_COMPILER_LAUNCHER="sccache"
 
 ################################################################################
 # SETUP - Check environment
@@ -95,7 +91,8 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
         py.test --cache-clear --basetemp=${WORKSPACE}/rmm-cuda-tmp --junitxml=${WORKSPACE}/test-results/junit-rmm.xml -v --cov-config=.coveragerc --cov=rmm --cov-report=xml:${WORKSPACE}/python/rmm-coverage.xml --cov-report term
     fi
 else
-    export LD_LIBRARY_PATH="$WORKSPACE/ci/artifacts/rmm/cpu/conda_work/build:$LD_LIBRARY_PATH"
+
+    gpuci_mamba_retry install -c $WORKSPACE/ci/artifacts/rmm/cpu/.conda-bld/ librmm librmm_tests
 
     TESTRESULTS_DIR=${WORKSPACE}/test-results
     mkdir -p ${TESTRESULTS_DIR}
@@ -105,9 +102,8 @@ else
     nvidia-smi
 
     gpuci_logger "Running googletests"
-    # run gtests
-    cd $WORKSPACE/ci/artifacts/rmm/cpu/conda_work
-    for gt in "build/gtests/*" ; do
+    # run gtests from librmm_tests package
+    for gt in "$CONDA_PREFIX/bin/gtests/librmm/*" ; do
         ${gt} --gtest_output=xml:${TESTRESULTS_DIR}/
         exitcode=$?
         if (( ${exitcode} != 0 )); then
@@ -117,13 +113,6 @@ else
     done
 
     cd $WORKSPACE/python
-
-    CONDA_FILE=`find $WORKSPACE/ci/artifacts/rmm/cpu/.conda-bld/ -name "librmm*.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"
-    gpuci_mamba_retry install -c $WORKSPACE/ci/artifacts/rmm/cpu/.conda-bld/ "$CONDA_FILE"
-
     export LIBRMM_BUILD_DIR="$WORKSPACE/ci/artifacts/rmm/cpu/conda_work/build"
 
     gpuci_logger "Building rmm"