From 5702f050583d5fa0b50c9eea9deda6368f56651d Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 08:09:47 -0800 Subject: [PATCH 01/24] add logs to test that CPM override is working --- cpp/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 78a4dbb913..4e991db270 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -386,6 +386,7 @@ rapids_cmake_install_lib_dir(lib_dir) include(GNUInstallDirs) include(CPack) +message(FATAL_ERROR "--- using jameslamb/raft ---") install( TARGETS raft DESTINATION ${lib_dir} From 991863ab3fde798a86085e70cca84bf87eb9a920 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 08:42:21 -0800 Subject: [PATCH 02/24] try using filesets --- cpp/CMakeLists.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 4e991db270..e7c7d3be65 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -179,6 +179,16 @@ target_include_directories( raft INTERFACE "$" "$" ) +# associate headers with the target, so other projects can install just the +# headers via 'install(TARGETS raft)` +target_sources( + raft + INTERFACE + FILE_SET raft-headers + TYPE HEADERS + BASE_DIRS include/raft +) + # Keep RAFT as lightweight as possible. Only CUDA libs and rmm should be used in global target. target_link_libraries( raft INTERFACE rmm::rmm rmm::rmm_logger spdlog::spdlog_header_only cuco::cuco @@ -386,7 +396,7 @@ rapids_cmake_install_lib_dir(lib_dir) include(GNUInstallDirs) include(CPack) -message(FATAL_ERROR "--- using jameslamb/raft ---") +message(STATUS "--- using jameslamb/raft ---") install( TARGETS raft DESTINATION ${lib_dir} @@ -428,8 +438,14 @@ install( EXPORT raft-distributed-exports ) +# install( +# DIRECTORY include/raft +# COMPONENT raft +# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +# ) + install( - DIRECTORY include/raft + TARGETS raft COMPONENT raft DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) From 4ca7a43a1e9c99934c35e12e9cbbd41ec7a412ad Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 08:51:10 -0800 Subject: [PATCH 03/24] fix casing --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index e7c7d3be65..370bca9a60 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -184,7 +184,7 @@ target_include_directories( target_sources( raft INTERFACE - FILE_SET raft-headers + FILE_SET raft_headers TYPE HEADERS BASE_DIRS include/raft ) From f5063231c84d2bf4152e9f073d08d38ea9ff0dbf Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 09:13:50 -0800 Subject: [PATCH 04/24] specify file-set --- cpp/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 370bca9a60..f08f3c83d1 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -447,6 +447,7 @@ install( install( TARGETS raft COMPONENT raft + FILE_SET raft_headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) From 96bbe9c82f6e67d97d08516d5e38dcc39f331594 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 09:23:53 -0800 Subject: [PATCH 05/24] try to get a new error --- cpp/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index f08f3c83d1..4ebc75ba13 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -401,6 +401,7 @@ install( TARGETS raft DESTINATION ${lib_dir} COMPONENT raft + FILE_SET raft_headers EXPORT raft-exports ) From a2d51e47d49464b254eefa495a05ead63a4bcf9b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 09:35:23 -0800 Subject: [PATCH 06/24] re-order --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 4ebc75ba13..ee3271a55e 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -399,10 +399,10 @@ include(CPack) message(STATUS "--- using jameslamb/raft ---") install( TARGETS raft + EXPORT raft-exports DESTINATION ${lib_dir} COMPONENT raft FILE_SET raft_headers - EXPORT raft-exports ) install( From a6fe204bdc4c27e64f6d0e6c83d89ef97c980e1f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 09:56:27 -0800 Subject: [PATCH 07/24] remove duplicate install() --- cpp/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index ee3271a55e..99301149b7 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -445,12 +445,12 @@ install( # DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} # ) -install( - TARGETS raft - COMPONENT raft - FILE_SET raft_headers - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) +# install( +# TARGETS raft +# COMPONENT raft +# FILE_SET raft_headers +# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +# ) # Temporary install of raft.hpp while the file is removed install( From 78aef373a9ef09a75ca60850e76e439b998c60a4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 10:31:24 -0800 Subject: [PATCH 08/24] does it need to be public? --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 99301149b7..d45f8d8f3e 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -183,7 +183,7 @@ target_include_directories( # headers via 'install(TARGETS raft)` target_sources( raft - INTERFACE + PUBLIC FILE_SET raft_headers TYPE HEADERS BASE_DIRS include/raft From 69137a65c8ffbc90778e6246cb66892eed47c6f2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 11:10:24 -0800 Subject: [PATCH 09/24] change type --- cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index d45f8d8f3e..fbf494ba14 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -185,8 +185,8 @@ target_sources( raft PUBLIC FILE_SET raft_headers - TYPE HEADERS - BASE_DIRS include/raft + HEADERS + BASE_DIRS include/raft ) # Keep RAFT as lightweight as possible. Only CUDA libs and rmm should be used in global target. From 92d9af0831713f137eea66ea2daf822e83fc0cf0 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 11:37:48 -0800 Subject: [PATCH 10/24] fix type --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index fbf494ba14..5afca50c21 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -185,7 +185,7 @@ target_sources( raft PUBLIC FILE_SET raft_headers - HEADERS + TYPE HEADERS BASE_DIRS include/raft ) From 1857d4ba5b9b760efcf05ab4804464c6c859db4a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 12:16:14 -0800 Subject: [PATCH 11/24] try explicitly listing files --- cpp/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 5afca50c21..a3da282e19 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -186,7 +186,9 @@ target_sources( PUBLIC FILE_SET raft_headers TYPE HEADERS - BASE_DIRS include/raft + FILES + common/cub_wrappers.cuh + BASE_DIRS include/raft/ ) # Keep RAFT as lightweight as possible. Only CUDA libs and rmm should be used in global target. From 65b25d192bb6d83b47007d77bd7ee2cbe8c02757 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 12:21:25 -0800 Subject: [PATCH 12/24] hmmm --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index a3da282e19..1546014eb6 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -187,7 +187,7 @@ target_sources( FILE_SET raft_headers TYPE HEADERS FILES - common/cub_wrappers.cuh + include/raft/common/cub_wrappers.cuh BASE_DIRS include/raft/ ) From c39f3955b50fbc25ee0c7cb4ac5ed42cf2df3ef0 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Dec 2024 12:43:42 -0800 Subject: [PATCH 13/24] no BASE_DIRS --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1546014eb6..00f1fad71b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -188,7 +188,7 @@ target_sources( TYPE HEADERS FILES include/raft/common/cub_wrappers.cuh - BASE_DIRS include/raft/ + # BASE_DIRS include/raft/ ) # Keep RAFT as lightweight as possible. Only CUDA libs and rmm should be used in global target. From 983817b1b5def3baded2773d958acd393856a7b7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 07:19:11 -0800 Subject: [PATCH 14/24] omit export --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 00f1fad71b..3ed657ec48 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -401,7 +401,7 @@ include(CPack) message(STATUS "--- using jameslamb/raft ---") install( TARGETS raft - EXPORT raft-exports + #EXPORT raft-exports DESTINATION ${lib_dir} COMPONENT raft FILE_SET raft_headers From bc5282f39675d977a9a2384860c8e838672a9951 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 07:24:58 -0800 Subject: [PATCH 15/24] revert --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 3ed657ec48..00f1fad71b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -401,7 +401,7 @@ include(CPack) message(STATUS "--- using jameslamb/raft ---") install( TARGETS raft - #EXPORT raft-exports + EXPORT raft-exports DESTINATION ${lib_dir} COMPONENT raft FILE_SET raft_headers From 29c95466c6a4daffdc4f22afffd0a9aa399bdb57 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 08:32:02 -0800 Subject: [PATCH 16/24] glob for headers --- cpp/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 00f1fad71b..703894442d 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -181,13 +181,19 @@ target_include_directories( # associate headers with the target, so other projects can install just the # headers via 'install(TARGETS raft)` +file( + GLOB_RECURSE _raft_headers + RELATIVE include/ + * +) target_sources( raft PUBLIC FILE_SET raft_headers TYPE HEADERS FILES - include/raft/common/cub_wrappers.cuh + #include/raft/common/cub_wrappers.cuh + ${_raft_headers} # BASE_DIRS include/raft/ ) From 5ea2a70b753c7beb5655fd6dd0b10d1fe3cf5821 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 08:41:47 -0800 Subject: [PATCH 17/24] debug --- cpp/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 703894442d..ad732cc9a9 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -184,8 +184,9 @@ target_include_directories( file( GLOB_RECURSE _raft_headers RELATIVE include/ - * + .* ) +message(FATAL_ERROR "--- _raft_headers: ${_raft_headers}") target_sources( raft PUBLIC From 419104ecfc01fb6f3fffc5db03757ac36165c01f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 08:45:59 -0800 Subject: [PATCH 18/24] more debug --- cpp/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index ad732cc9a9..3b017dabdb 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -183,8 +183,7 @@ target_include_directories( # headers via 'install(TARGETS raft)` file( GLOB_RECURSE _raft_headers - RELATIVE include/ - .* + "${CMAKE_CURRENT_SOURCE_DIR}/include/*" ) message(FATAL_ERROR "--- _raft_headers: ${_raft_headers}") target_sources( From 7bcf096c017be5b91e4f95d5b86febb083fb10db Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 08:48:16 -0800 Subject: [PATCH 19/24] try without CMAKE_CURRENT_SOURCE_DIR --- cpp/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 3b017dabdb..9d33986aec 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -183,7 +183,8 @@ target_include_directories( # headers via 'install(TARGETS raft)` file( GLOB_RECURSE _raft_headers - "${CMAKE_CURRENT_SOURCE_DIR}/include/*" + #"${CMAKE_CURRENT_SOURCE_DIR}/include/*" + "include/*" ) message(FATAL_ERROR "--- _raft_headers: ${_raft_headers}") target_sources( From 1e1ca19911b3741f2f896401de21bc84f6f36e09 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 08:56:57 -0800 Subject: [PATCH 20/24] remove debug print --- cpp/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 9d33986aec..942f7c41b4 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -186,7 +186,6 @@ file( #"${CMAKE_CURRENT_SOURCE_DIR}/include/*" "include/*" ) -message(FATAL_ERROR "--- _raft_headers: ${_raft_headers}") target_sources( raft PUBLIC From 254fe9cd3198e607e94dce4f8486a872409db19d Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 10:32:16 -0800 Subject: [PATCH 21/24] remove debugging stuff --- cpp/CMakeLists.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 942f7c41b4..17dacc9027 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -447,19 +447,6 @@ install( EXPORT raft-distributed-exports ) -# install( -# DIRECTORY include/raft -# COMPONENT raft -# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -# ) - -# install( -# TARGETS raft -# COMPONENT raft -# FILE_SET raft_headers -# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -# ) - # Temporary install of raft.hpp while the file is removed install( FILES include/raft.hpp From 8809c72edd8e02f71f9d3625c44c705327106521 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 10:34:28 -0800 Subject: [PATCH 22/24] remove more debugging stuff --- cpp/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 17dacc9027..e1dc798565 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -181,6 +181,7 @@ target_include_directories( # associate headers with the target, so other projects can install just the # headers via 'install(TARGETS raft)` +# TODO(jameslamb): remove commented-out stuff file( GLOB_RECURSE _raft_headers #"${CMAKE_CURRENT_SOURCE_DIR}/include/*" @@ -407,9 +408,9 @@ include(CPack) message(STATUS "--- using jameslamb/raft ---") install( TARGETS raft - EXPORT raft-exports DESTINATION ${lib_dir} COMPONENT raft + EXPORT raft-exports FILE_SET raft_headers ) From 8f10cec9e20a8d05403e06c52deb0a3fa790b399 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 10:44:12 -0800 Subject: [PATCH 23/24] skip all CI --- .github/workflows/pr.yaml | 145 -------------------------------------- 1 file changed, 145 deletions(-) delete mode 100644 .github/workflows/pr.yaml diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml deleted file mode 100644 index 965943e726..0000000000 --- a/.github/workflows/pr.yaml +++ /dev/null @@ -1,145 +0,0 @@ -name: pr - -on: - push: - branches: - - "pull-request/[0-9]+" - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - pr-builder: - needs: - - changed-files - - checks - - conda-cpp-build - - conda-cpp-tests - - conda-cpp-checks - - conda-python-build - - conda-python-tests - - docs-build - - wheel-build-pylibraft - - wheel-tests-pylibraft - - wheel-build-raft-dask - - wheel-tests-raft-dask - - devcontainer - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02 - if: always() - with: - needs: ${{ toJSON(needs) }} - changed-files: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.02 - with: - files_yaml: | - test_cpp: - - '**' - - '!.devcontainer/**' - - '!.pre-commit-config.yaml' - - '!CONTRIBUTING.md' - - '!README.md' - - '!docs/**' - - '!img/**' - - '!python/**' - - '!thirdparty/LICENSES/**' - test_python: - - '**' - - '!.devcontainer/**' - - '!.pre-commit-config.yaml' - - '!CONTRIBUTING.md' - - '!README.md' - - '!docs/**' - - '!img/**' - - '!thirdparty/LICENSES/**' - checks: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02 - with: - enable_check_generated_files: false - conda-cpp-build: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02 - with: - build_type: pull-request - node_type: cpu16 - conda-cpp-tests: - needs: [conda-cpp-build, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.02 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp - with: - build_type: pull-request - conda-cpp-checks: - needs: conda-cpp-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.02 - with: - build_type: pull-request - enable_check_symbols: true - conda-python-build: - needs: conda-cpp-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02 - with: - build_type: pull-request - conda-python-tests: - needs: [conda-python-build, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - docs-build: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 - with: - build_type: pull-request - node_type: "gpu-v100-latest-1" - arch: "amd64" - container_image: "rapidsai/ci-conda:latest" - run_script: "ci/build_docs.sh" - wheel-build-pylibraft: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02 - with: - build_type: pull-request - script: ci/build_wheel_pylibraft.sh - wheel-tests-pylibraft: - needs: [wheel-build-pylibraft, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_pylibraft.sh - wheel-build-raft-dask: - needs: wheel-tests-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02 - with: - build_type: pull-request - script: "ci/build_wheel_raft_dask.sh" - wheel-tests-raft-dask: - needs: [wheel-build-raft-dask, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_raft_dask.sh - devcontainer: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.02 - with: - arch: '["amd64"]' - cuda: '["12.5"]' - build_command: | - sccache -z; - build-all -DBUILD_PRIMS_BENCH=ON --verbose; - sccache -s; From ebdbe4d729cafc444eeb8f114a0c5c4ea2e2a0cd Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 12 Dec 2024 10:44:46 -0800 Subject: [PATCH 24/24] Revert "skip all CI" This reverts commit 8f10cec9e20a8d05403e06c52deb0a3fa790b399. --- .github/workflows/pr.yaml | 145 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 .github/workflows/pr.yaml diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml new file mode 100644 index 0000000000..965943e726 --- /dev/null +++ b/.github/workflows/pr.yaml @@ -0,0 +1,145 @@ +name: pr + +on: + push: + branches: + - "pull-request/[0-9]+" + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + pr-builder: + needs: + - changed-files + - checks + - conda-cpp-build + - conda-cpp-tests + - conda-cpp-checks + - conda-python-build + - conda-python-tests + - docs-build + - wheel-build-pylibraft + - wheel-tests-pylibraft + - wheel-build-raft-dask + - wheel-tests-raft-dask + - devcontainer + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02 + if: always() + with: + needs: ${{ toJSON(needs) }} + changed-files: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.02 + with: + files_yaml: | + test_cpp: + - '**' + - '!.devcontainer/**' + - '!.pre-commit-config.yaml' + - '!CONTRIBUTING.md' + - '!README.md' + - '!docs/**' + - '!img/**' + - '!python/**' + - '!thirdparty/LICENSES/**' + test_python: + - '**' + - '!.devcontainer/**' + - '!.pre-commit-config.yaml' + - '!CONTRIBUTING.md' + - '!README.md' + - '!docs/**' + - '!img/**' + - '!thirdparty/LICENSES/**' + checks: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02 + with: + enable_check_generated_files: false + conda-cpp-build: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02 + with: + build_type: pull-request + node_type: cpu16 + conda-cpp-tests: + needs: [conda-cpp-build, changed-files] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.02 + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp + with: + build_type: pull-request + conda-cpp-checks: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.02 + with: + build_type: pull-request + enable_check_symbols: true + conda-python-build: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02 + with: + build_type: pull-request + conda-python-tests: + needs: [conda-python-build, changed-files] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02 + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + with: + build_type: pull-request + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" + wheel-build-pylibraft: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02 + with: + build_type: pull-request + script: ci/build_wheel_pylibraft.sh + wheel-tests-pylibraft: + needs: [wheel-build-pylibraft, changed-files] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + with: + build_type: pull-request + script: ci/test_wheel_pylibraft.sh + wheel-build-raft-dask: + needs: wheel-tests-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02 + with: + build_type: pull-request + script: "ci/build_wheel_raft_dask.sh" + wheel-tests-raft-dask: + needs: [wheel-build-raft-dask, changed-files] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + with: + build_type: pull-request + script: ci/test_wheel_raft_dask.sh + devcontainer: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.02 + with: + arch: '["amd64"]' + cuda: '["12.5"]' + build_command: | + sccache -z; + build-all -DBUILD_PRIMS_BENCH=ON --verbose; + sccache -s;