Merge branch 'branch-24.04' into rhdong/bitmap

rapidsai · Mar 7, 2024 · 311f2d1 · 311f2d1
2 parents 59533e0 + 2d714cb
commit 311f2d1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/conda/recipes/libraft/build_libraft.sh b/conda/recipes/libraft/build_libraft.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
-./build.sh libraft --allgpuarch --compile-lib --build-metrics=compile_lib --incl-cache-stats --no-nvtx
+./build.sh libraft --allgpuarch --compile-lib --build-metrics=compile_lib --incl-cache-stats --no-nvtx -n
+cmake --install cpp/build --component compiled
diff --git a/conda/recipes/libraft/build_libraft_headers.sh b/conda/recipes/libraft/build_libraft_headers.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
+# We must install everything (not just the "raft" component) because some
+# dependencies like cuCollections and cutlass place their install rules in the
+# "all" component.
 ./build.sh libraft --allgpuarch --no-nvtx
diff --git a/conda/recipes/libraft/build_libraft_tests.sh b/conda/recipes/libraft/build_libraft_tests.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 
 ./build.sh tests bench-prims --allgpuarch --no-nvtx --build-metrics=tests_bench_prims --incl-cache-stats
 cmake --install cpp/build --component testing
diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml
@@ -19,6 +19,9 @@ cmake_version:
 nccl_version:
   - ">=2.9.9"
 
+gbench_version:
+  - "==1.8.0"
+
 gtest_version:
   - ">=1.13.0"
 

diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml
@@ -280,7 +280,11 @@ outputs:
         - ninja
         - sysroot_{{ target_platform }} {{ sysroot_version }}
       host:
+        # We must include both libraft and libraft-static to prevent the test
+        # builds from packaging those libraries. However, tests only depend on
+        # the shared library in libraft.
         - {{ pin_subpackage('libraft', exact=True) }}
+        - {{ pin_subpackage('libraft-static', exact=True) }}
         - cuda-version ={{ cuda_version }}
         {% if cuda_major == "11" %}
         - cuda-profiler-api {{ cuda11_cuda_profiler_api_run_version }}
@@ -300,6 +304,7 @@ outputs:
         - libcusolver-dev
         - libcusparse-dev
         {% endif %}
+        - benchmark {{ gbench_version }}
         - gmock {{ gtest_version }}
         - gtest {{ gtest_version }}
       run:
@@ -314,6 +319,7 @@ outputs:
         - libcusparse
         {% endif %}
         - {{ pin_subpackage('libraft', exact=True) }}
+        - benchmark {{ gbench_version }}
         - gmock {{ gtest_version }}
         - gtest {{ gtest_version }}
     about: