Verify all thrust/cub kernels are hidden when using patch

rapidsai · Jan 17, 2024 · 20cb20b · 20cb20b
1 parent ffcfbcc
commit 20cb20b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 39 deletions.
diff --git a/conda/recipes/libcugraph/build.sh b/conda/recipes/libcugraph/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2019-2022, NVIDIA CORPORATION.
+# Copyright (c) 2019-2024, NVIDIA CORPORATION.
 
 # This assumes the script is executed from the root of the repo directory
 
@@ -8,4 +8,4 @@
 # openmpi build dependencies). The conda package does NOT include these test
 # binaries or extra dependencies, but these are built here for use in CI runs.
 
-./build.sh libcugraph libcugraph_etl cpp-mgtests -n -v --allgpuarch
+./build.sh libcugraph cpp-mgtests -n -v --allgpuarch
diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023, NVIDIA CORPORATION.
+# Copyright (c) 2018-2024, NVIDIA CORPORATION.
 
 {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
@@ -70,11 +70,11 @@ requirements:
     - doxygen {{ doxygen_version }}
     - gmock {{ gtest_version }}
     - gtest {{ gtest_version }}
-    - libcudf ={{ minor_version }}
-    - libcugraphops ={{ minor_version }}
-    - libraft ={{ minor_version }}
-    - libraft-headers ={{ minor_version }}
-    - librmm ={{ minor_version }}
+    # - libcudf ={{ minor_version }}
+    # - libcugraphops ={{ minor_version }}
+    # - libraft ={{ minor_version }}
+    # - libraft-headers ={{ minor_version }}
+    # - librmm ={{ minor_version }}
     - nccl {{ nccl_version }}
     - ucx-proc=*=gpu
 
@@ -122,35 +122,6 @@ outputs:
       license: Apache-2.0
       license_file: ../../../LICENSE
       summary: libcugraph library
-  - name: libcugraph_etl
-    version: {{ version }}
-    script: install_libcugraph_etl.sh
-    build:
-      number: {{ GIT_DESCRIBE_NUMBER }}
-      string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
-      ignore_run_exports_from:
-        {% if cuda_major == "11" %}
-        - {{ compiler('cuda11') }}
-        {% endif %}
-    requirements:
-      build:
-        - cmake {{ cmake_version }}
-      host:
-        - cuda-version ={{ cuda_version }}
-      run:
-        - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
-        - {{ pin_subpackage('libcugraph', exact=True) }}
-        {% if cuda_major == "11" %}
-        - cudatoolkit
-        {% endif %}
-        - libcudf ={{ minor_version }}
-        - librmm ={{ minor_version }}
-    about:
-      home: https://rapids.ai/
-      dev_url: https://github.com/rapidsai/cugraph
-      license: Apache-2.0
-      license_file: ../../../LICENSE
-      summary: libcugraph_etl library
   - name: libcugraph-tests
     version: {{ version }}
     script: install_libcugraph_tests.sh
@@ -168,7 +139,7 @@ outputs:
         - cuda-version ={{ cuda_version }}
       run:
         - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
-        - {{ pin_subpackage('libcugraph_etl', exact=True) }}
+        # - {{ pin_subpackage('libcugraph_etl', exact=True) }}
         - {{ pin_subpackage('libcugraph', exact=True) }}
         {% if cuda_major == "11" %}
         - cudatoolkit

diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -16,4 +16,6 @@ if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS.cmake)
        ${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS.cmake
   )
 endif()
+set(rapids-cmake-repo robertmaynard/rapids-cmake)
+set(rapids-cmake-branch bug/mark_cccl_cuco_kernels_as_hidden)
 include(${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS.cmake)