Add libcuml-tests package (#4635)

Add a `libcuml-tests` package to the `libcuml` recipe: - This is a prerequisite for removing "Project Flash" from our build/CI scripts. - The `libcuml-tests` package was added as an additional output to the existing `libcuml` recipe (which was renamed to `libcuml-split`) Authors: - Jordan Jacobelli (https://github.com/Ethyling) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Dante Gama Dessavre (https://github.com/dantegd) URL: #4635
rapidsai · Apr 4, 2022 · c4c80aa · c4c80aa
1 parent e6f6f2e
commit c4c80aa
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 94 deletions.
diff --git a/build.sh b/build.sh
@@ -268,7 +268,11 @@ fi
 # If `./build.sh cuml` is called, don't build C/C++ components
 if completeBuild || hasArg libcuml || hasArg prims || hasArg bench || hasArg cpp-mgtests; then
     cd ${LIBCUML_BUILD_DIR}
-    cmake --build ${LIBCUML_BUILD_DIR} -j${PARALLEL_LEVEL} ${build_args} --target ${INSTALL_TARGET} ${VERBOSE_FLAG}
+    if [ -n "${INSTALL_TARGET}" ]; then
+      cmake --build ${LIBCUML_BUILD_DIR} -j${PARALLEL_LEVEL} ${build_args} --target ${INSTALL_TARGET} ${VERBOSE_FLAG}
+    else
+      cmake --build ${LIBCUML_BUILD_DIR} -j${PARALLEL_LEVEL} ${build_args} ${VERBOSE_FLAG}
+    fi
 fi
 
 if hasArg cppdocs; then

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
@@ -34,10 +34,6 @@ fi
 # ucx-py version
 export UCX_PY_VERSION='0.26.*'
 
-export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"
-export CMAKE_CXX_COMPILER_LAUNCHER="sccache"
-export CMAKE_C_COMPILER_LAUNCHER="sccache"
-
 ################################################################################
 # SETUP - Check environment
 ################################################################################

diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2018-2021, NVIDIA CORPORATION.
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
 
 set -e
 
@@ -22,32 +22,21 @@ if [[ -z "$MY_UPLOAD_KEY" ]]; then
   return 0
 fi
 
-################################################################################
-# SETUP - Get conda file output locations
-################################################################################
-
-gpuci_logger "Get conda file output locations"
-
-export LIBCUML_FILE=`conda build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuml --output`
-export CUML_FILE=`conda build --croot ${CONDA_BLD_DIR} conda/recipes/cuml --python=$PYTHON --output`
-
 ################################################################################
 # UPLOAD - Conda packages
 ################################################################################
 
 gpuci_logger "Starting conda uploads"
 
 if [[ "$BUILD_LIBCUML" == "1" && "$UPLOAD_LIBCUML" == "1" ]]; then
-  test -e ${LIBCUML_FILE}
+  LIBCUML_FILES=$(conda build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuml --output)
   echo "Upload libcuml"
-  echo ${LIBCUML_FILE}
-  gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${LIBCUML_FILE} --no-progress
+  gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing --no-progress ${LIBCUML_FILES}
 fi
 
 if [[ "$BUILD_CUML" == "1" && "$UPLOAD_CUML" == "1" ]]; then
+  CUML_FILE=$(conda build --croot ${CONDA_BLD_DIR} conda/recipes/cuml --python=$PYTHON --output)
   test -e ${CUML_FILE}
-  echo "Upload cuml"
-  echo ${CUML_FILE}
+  echo "Upload cuml: ${CUML_FILE}"
   gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${CUML_FILE} --no-progress
 fi
-
diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -34,10 +34,6 @@ export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
 # ucx-py version
 export UCX_PY_VERSION='0.26.*'
 
-export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"
-export CMAKE_CXX_COMPILER_LAUNCHER="sccache"
-export CMAKE_C_COMPILER_LAUNCHER="sccache"
-
 ################################################################################
 # SETUP - Check environment
 ################################################################################
@@ -90,11 +86,6 @@ conda info
 conda config --show-sources
 conda list --show-channel-urls
 
-gpuci_logger "Adding ${CONDA_PREFIX}/lib to LD_LIBRARY_PATH"
-
-export LD_LIBRARY_PATH_CACHED=$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
-
 if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
     gpuci_logger "Building doxygen C++ docs"
     $WORKSPACE/build.sh cppdocs -v
@@ -106,8 +97,6 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
     gpuci_logger "Build from source"
     $WORKSPACE/build.sh clean libcuml cuml prims bench -v --codecov
 
-    gpuci_logger "Resetting LD_LIBRARY_PATH"
-
     cd $WORKSPACE
 
     ################################################################################
@@ -172,10 +161,6 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
         python ../scripts/cuda-memcheck.py -tool memcheck -exe ./test/prims
     fi
 else
-    #Project Flash
-    export LIBCUML_BUILD_DIR="$WORKSPACE/ci/artifacts/cuml/cpu/conda_work/cpp/build"
-    export LD_LIBRARY_PATH="$LIBCUML_BUILD_DIR:$LD_LIBRARY_PATH"
-
     if hasArg --skip-tests; then
         gpuci_logger "Skipping Tests"
         exit 0
@@ -184,31 +169,17 @@ else
     gpuci_logger "Check GPU usage"
     nvidia-smi
 
-    gpuci_logger "Update binaries"
-    cd $LIBCUML_BUILD_DIR
-    chrpath -d libcuml.so
-    chrpath -d libcuml++.so
-    patchelf --replace-needed `patchelf --print-needed libcuml++.so | grep faiss` libfaiss.so libcuml++.so
+    gpuci_mamba_retry install -y -c ${CONDA_ARTIFACT_PATH} libcuml libcuml-tests
 
-    gpuci_logger "Running libcuml binaries"
+    gpuci_logger "Running libcuml test binaries"
     GTEST_ARGS="xml:${WORKSPACE}/test-results/libcuml_cpp/"
-    for gt in $(find ./test -name "*_TEST" | grep -v "PRIMS_" || true); do
+    for gt in "$CONDA_PREFIX/bin/gtests/libcuml/"*; do
         test_name=$(basename $gt)
-        echo "Patching gtest $test_name"
-        chrpath -d ${gt}
-        patchelf --replace-needed `patchelf --print-needed ${gt} | grep faiss` libfaiss.so ${gt}
         echo "Running gtest $test_name"
         ${gt} ${GTEST_ARGS}
         echo "Ran gtest $test_name : return code was: $?, test script exit code is now: $EXITCODE"
     done
 
-
-    CONDA_FILE=`find ${CONDA_ARTIFACT_PATH} -name "libcuml*.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 ${CONDA_ARTIFACT_PATH} "$CONDA_FILE"
-
     # FIXME: Project FLASH only builds for python version 3.8 which is the one used in
     # the CUDA 11.0 job, need to change all versions to project flash
     if [ "$CUDA_REL" == "11.0" ];then
@@ -260,13 +231,9 @@ else
     ################################################################################
 
     gpuci_logger "Run ml-prims test"
-    cd $LIBCUML_BUILD_DIR
     GTEST_ARGS="xml:${WORKSPACE}/test-results/prims/"
-    for gt in $(find ./test -name "*_TEST" | grep -v "SG_\|MG_" || true); do
+    for gt in "$CONDA_PREFIX/bin/gtests/libcuml_prims/"*; do
         test_name=$(basename $gt)
-        echo "Patching gtest $test_name"
-        chrpath -d ${gt}
-        patchelf --replace-needed `patchelf --print-needed ${gt} | grep faiss` libfaiss.so ${gt}
         echo "Running gtest $test_name"
         ${gt} ${GTEST_ARGS}
         echo "Ran gtest $test_name : return code was: $?, test script exit code is now: $EXITCODE"

diff --git a/conda/recipes/libcuml/build.sh b/conda/recipes/libcuml/build.sh
@@ -1,12 +1,10 @@
+#!/bin/bash
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
 
 if [ -n "$MACOSX_DEPLOYMENT_TARGET" ]; then
     # C++11 requires 10.9
     # but cudatoolkit 8 is build for 10.11
     export MACOSX_DEPLOYMENT_TARGET=10.11
 fi
 
-if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
-    ./build.sh clean libcuml -v --allgpuarch
-else
-    ./build.sh clean libcuml prims -v --allgpuarch
-fi
+./build.sh -n clean libcuml prims -v --allgpuarch
diff --git a/conda/recipes/libcuml/conda_build_config.yaml b/conda/recipes/libcuml/conda_build_config.yaml
@@ -0,0 +1,17 @@
+cmake_version:
+  - ">=3.20.1,<3.23"
+
+nccl_version:
+  - ">=2.9.9"
+
+treelite_version:
+  - "2.3.0"
+
+gtest_version:
+  - "1.10.0"
+
+libfaiss_version:
+  - "1.7.0"
+
+libcusolver_version:
+  - ">=11.2.1"
diff --git a/conda/recipes/libcuml/install_libcuml.sh b/conda/recipes/libcuml/install_libcuml.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
+
+cmake --install cpp/build
diff --git a/conda/recipes/libcuml/install_libcuml_tests.sh b/conda/recipes/libcuml/install_libcuml_tests.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
+
+cmake --install cpp/build --component testing
diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml
@@ -3,20 +3,19 @@
 # Usage:
 #   conda build . -c conda-forge -c nvidia -c rapidsai -c pytorch
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
-{% set minor_version =  version.split('.')[0] + '.' + version.split('.')[1] %}
-{% set cuda_version='.'.join(environ.get('CUDA', '9.2').split('.')[:2]) %}
-{% set cuda_major=cuda_version.split('.')[0] %}
+{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
+{% set cuda_version = '.'.join(environ.get('CUDA', '9.2').split('.')[:2]) %}
+{% set cuda_major = cuda_version.split('.')[0] %}
+{% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0
 {% set ucx_py_version=environ.get('UCX_PY_VERSION') %}
+
 package:
-  name: libcuml
-  version: {{ version }}
+  name: libcuml-split
 
 source:
   git_url: ../../..
 
 build:
-  number: {{ GIT_DESCRIBE_NUMBER }}
-  string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script_env:
     - CC
     - CXX
@@ -36,9 +35,9 @@ build:
 
 requirements:
   build:
-    - cmake>=3.20.1,<3.23
+    - cmake {{ cmake_version }}
   host:
-    - nccl>=2.9.9
+    - nccl {{ nccl_version }}
     - cudf {{ minor_version }}
     - cudatoolkit {{ cuda_version }}.*
     - ucx-py {{ ucx_py_version }}
@@ -48,28 +47,55 @@ requirements:
     - libraft-distance {{ minor_version }}
     - libraft-nn {{ minor_version }}
     - lapack
-    - treelite=2.3.0
+    - treelite {{ treelite_version }}
     - faiss-proc=*=cuda
-    - gtest=1.10.0
+    - gtest {{ gtest_version }}
     - gmock
-    - libfaiss 1.7.0 *_cuda
-  run:
-    - libcumlprims {{ minor_version }}
-    - libraft-headers {{ minor_version }}
-    - libraft-distance {{ minor_version }}
-    - libraft-nn {{ minor_version }}
-    - cudf {{ minor_version }}
-    - nccl>=2.9.9
-    - ucx-py {{ ucx_py_version }}
-    - ucx-proc=*=gpu
-    - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
-    - treelite=2.3.0
-    - faiss-proc=*=cuda
-    - libfaiss 1.7.0 *_cuda
-    - libcusolver>=11.2.1
+    - libfaiss {{ libfaiss_version }} *_cuda
 
-about:
-  home: http://rapids.ai/
-  license: Apache-2.0
-  # license_file: LICENSE
-  summary: libcuml library
+outputs:
+  - name: libcuml
+    version: {{ version }}
+    script: install_libcuml.sh
+    build:
+      number: {{ GIT_DESCRIBE_NUMBER }}
+      string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
+    requirements:
+      build:
+        - cmake {{ cmake_version }}
+      run:
+        - cudatoolkit {{ cuda_spec }}
+        - libcumlprims {{ minor_version }}
+        - libraft-headers {{ minor_version }}
+        - libraft-distance {{ minor_version }}
+        - libraft-nn {{ minor_version }}
+        - cudf {{ minor_version }}
+        - nccl {{ nccl_version }}
+        - ucx-py {{ ucx_py_version }}
+        - ucx-proc=*=gpu
+        - treelite {{ treelite_version }}
+        - faiss-proc=*=cuda
+        - libfaiss {{ libfaiss_version }} *_cuda
+        - libcusolver {{ libcusolver_version }}
+    about:
+      home: http://rapids.ai/
+      license: Apache-2.0
+      summary: libcuml library
+  - name: libcuml-tests
+    version: {{ version }}
+    script: install_libcuml_tests.sh
+    build:
+      number: {{ GIT_DESCRIBE_NUMBER }}
+      string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
+    requirements:
+      build:
+        - cmake {{ cmake_version }}
+      run:
+        - cudatoolkit {{ cuda_spec }}
+        - {{ pin_subpackage('libcuml', exact=True) }}
+        - gtest {{ gtest_version }}
+        - gmock {{ gtest_version }}
+    about:
+      home: http://rapids.ai/
+      license: Apache-2.0
+      summary: libcuml test & benchmark executables