From 9e01b9bae522a372b6ef32e77c72e90c831b626f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 25 Apr 2024 12:57:03 -0700 Subject: [PATCH 1/6] update fmt (>=10.2.1) and spdlog (>=1.13) --- conda/recipes/libraft/conda_build_config.yaml | 4 ++-- .../raft-ann-bench-cpu/conda_build_config.yaml | 4 ++-- cpp/cmake/thirdparty/get_spdlog.cmake | 18 +++++------------- rapids_config.cmake | 5 +++++ 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml index 385cd831fc..e95b3aa4b7 100644 --- a/conda/recipes/libraft/conda_build_config.yaml +++ b/conda/recipes/libraft/conda_build_config.yaml @@ -70,7 +70,7 @@ cuda11_cuda_profiler_api_run_version: - ">=11.4.240,<12" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.13.0,<1.14" fmt_version: - - ">=10.1.1,<11" + - ">=10.2.1,<11" diff --git a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml index 93a5532962..8ca17844f5 100644 --- a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml +++ b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml @@ -20,7 +20,7 @@ nlohmann_json_version: - ">=3.11.2" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.13.0,<1.14" fmt_version: - - ">=10.1.1,<11" + - ">=10.2.1,<11" diff --git a/cpp/cmake/thirdparty/get_spdlog.cmake b/cpp/cmake/thirdparty/get_spdlog.cmake index 7be7804c7e..258e77eb3d 100644 --- a/cpp/cmake/thirdparty/get_spdlog.cmake +++ b/cpp/cmake/thirdparty/get_spdlog.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-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,18 +16,10 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports) - rapids_export_package(BUILD spdlog rmm-exports) - - if(spdlog_ADDED) - rapids_export( - BUILD spdlog - EXPORT_SET spdlog - GLOBAL_TARGETS spdlog spdlog_header_only - NAMESPACE spdlog::) - include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET rmm-exports) - endif() + rapids_cpm_spdlog( + FMT_OPTION "EXTERNAL_FMT_HO" + INSTALL_EXPORT_SET rmm-exports + BUILD_EXPORT_SET rmm-exports) endfunction() find_and_configure_spdlog() \ No newline at end of file diff --git a/rapids_config.cmake b/rapids_config.cmake index c8077f7f4b..00daf92d5a 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,6 +26,11 @@ else() endif() if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + include(FetchContent) + FetchContent_Declare( + rapids-cmake + GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git + GIT_TAG fmt-version) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From ad8092833c9b27f2a9fea24de60ed00c7a7f9285 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 25 Apr 2024 13:36:16 -0700 Subject: [PATCH 2/6] skip wheel workflows while testing --- .github/workflows/build.yaml | 78 ++++++++++++++++++------------------ .github/workflows/pr.yaml | 64 ++++++++++++++--------------- .github/workflows/test.yaml | 36 ++++++++--------- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c8837afba7..390466d6ec 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,42 +67,42 @@ jobs: node_type: "gpu-v100-latest-1" run_script: "ci/build_docs.sh" sha: ${{ inputs.sha }} - wheel-build-pylibraft: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - script: ci/build_wheel_pylibraft.sh - wheel-publish-pylibraft: - needs: wheel-build-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - package-name: pylibraft - wheel-build-raft-dask: - needs: wheel-publish-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - script: ci/build_wheel_raft_dask.sh - wheel-publish-raft-dask: - needs: wheel-build-raft-dask - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - package-name: raft_dask + # wheel-build-pylibraft: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # script: ci/build_wheel_pylibraft.sh + # wheel-publish-pylibraft: + # needs: wheel-build-pylibraft + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # package-name: pylibraft + # wheel-build-raft-dask: + # needs: wheel-publish-pylibraft + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # script: ci/build_wheel_raft_dask.sh + # wheel-publish-raft-dask: + # needs: wheel-build-raft-dask + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # package-name: raft_dask diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c2d9556859..c25260fe3a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -19,10 +19,10 @@ jobs: - conda-python-build - conda-python-tests - docs-build - - wheel-build-pylibraft - - wheel-tests-pylibraft - - wheel-build-raft-dask - - wheel-tests-raft-dask + # - 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-24.06 @@ -74,34 +74,34 @@ jobs: 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-24.06 - with: - build_type: pull-request - script: ci/build_wheel_pylibraft.sh - wheel-tests-pylibraft: - needs: wheel-build-pylibraft - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - 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-24.06 - with: - build_type: pull-request - script: "ci/build_wheel_raft_dask.sh" - wheel-tests-raft-dask: - needs: wheel-build-raft-dask - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: pull-request - script: ci/test_wheel_raft_dask.sh + # wheel-build-pylibraft: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: ci/build_wheel_pylibraft.sh + # wheel-tests-pylibraft: + # needs: wheel-build-pylibraft + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # 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-24.06 + # with: + # build_type: pull-request + # script: "ci/build_wheel_raft_dask.sh" + # wheel-tests-raft-dask: + # needs: wheel-build-raft-dask + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # 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-24.06 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 18094cc05a..50c0351504 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -40,21 +40,21 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - wheel-tests-pylibraft: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_pylibraft.sh - wheel-tests-raft-dask: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel_raft_dask.sh + # wheel-tests-pylibraft: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: nightly + # branch: ${{ inputs.branch }} + # date: ${{ inputs.date }} + # sha: ${{ inputs.sha }} + # script: ci/test_wheel_pylibraft.sh + # wheel-tests-raft-dask: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: nightly + # branch: ${{ inputs.branch }} + # date: ${{ inputs.date }} + # sha: ${{ inputs.sha }} + # script: ci/test_wheel_raft_dask.sh From 122c8ebcb956e90b47082af4bea209c2568256cf Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 26 Apr 2024 10:11:16 -0500 Subject: [PATCH 3/6] test with rmm CI artifacts --- ci/build_cpp.sh | 6 +++++- ci/build_python.sh | 10 ++++++++++ ci/test_cpp.sh | 5 +++++ ci/test_python.sh | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 2778c2a7d7..67d418cf0e 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -13,10 +13,14 @@ export CMAKE_GENERATOR=Ninja rapids-print-env +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) + version=$(rapids-generate-version) rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft +RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry \ + --channel "${LIBRMM_CHANNEL}" \ + mambabuild conda/recipes/libraft rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index a8b76269ae..80ae2c5308 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,6 +16,8 @@ rapids-print-env rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) @@ -33,12 +35,16 @@ done rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/pylibraft rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/raft-dask # Build ann-bench for each cuda and python version @@ -46,6 +52,8 @@ rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/raft-ann-bench # Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python @@ -56,6 +64,8 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then --no-test \ --channel "${CPP_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ conda/recipes/raft-ann-bench-cpu fi diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index f83ddf616d..5e4e89d83f 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -22,6 +22,9 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -29,6 +32,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libraft-headers libraft libraft-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python.sh b/ci/test_python.sh index f5b188ca0b..28cca5e86a 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -25,6 +25,9 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1544 python) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}" @@ -34,6 +37,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libraft libraft-headers pylibraft raft-dask rapids-logger "Check GPU usage" From f253286d2710b5b4bae638eb3e4567145dc5ae39 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 26 Apr 2024 10:24:55 -0500 Subject: [PATCH 4/6] re-arrange commands --- ci/build_cpp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 67d418cf0e..c74ea32824 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -19,8 +19,8 @@ version=$(rapids-generate-version) rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry \ +RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ --channel "${LIBRMM_CHANNEL}" \ - mambabuild conda/recipes/libraft + conda/recipes/libraft rapids-upload-conda-to-s3 cpp From ab898484056babd4fb2b169d6c76df0ca9b318ef Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 26 Apr 2024 15:55:53 -0500 Subject: [PATCH 5/6] restore wheel CI --- .github/workflows/build.yaml | 78 ++++++++++++++++++------------------ .github/workflows/pr.yaml | 56 +++++++++++++------------- .github/workflows/test.yaml | 36 ++++++++--------- 3 files changed, 85 insertions(+), 85 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 390466d6ec..c8837afba7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,42 +67,42 @@ jobs: node_type: "gpu-v100-latest-1" run_script: "ci/build_docs.sh" sha: ${{ inputs.sha }} - # wheel-build-pylibraft: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # script: ci/build_wheel_pylibraft.sh - # wheel-publish-pylibraft: - # needs: wheel-build-pylibraft - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # package-name: pylibraft - # wheel-build-raft-dask: - # needs: wheel-publish-pylibraft - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # script: ci/build_wheel_raft_dask.sh - # wheel-publish-raft-dask: - # needs: wheel-build-raft-dask - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # package-name: raft_dask + wheel-build-pylibraft: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + script: ci/build_wheel_pylibraft.sh + wheel-publish-pylibraft: + needs: wheel-build-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: pylibraft + wheel-build-raft-dask: + needs: wheel-publish-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + script: ci/build_wheel_raft_dask.sh + wheel-publish-raft-dask: + needs: wheel-build-raft-dask + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: raft_dask diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c25260fe3a..9a62fa7de3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -74,34 +74,34 @@ jobs: 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-24.06 - # with: - # build_type: pull-request - # script: ci/build_wheel_pylibraft.sh - # wheel-tests-pylibraft: - # needs: wheel-build-pylibraft - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # 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-24.06 - # with: - # build_type: pull-request - # script: "ci/build_wheel_raft_dask.sh" - # wheel-tests-raft-dask: - # needs: wheel-build-raft-dask - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: ci/test_wheel_raft_dask.sh + wheel-build-pylibraft: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: pull-request + script: ci/build_wheel_pylibraft.sh + wheel-tests-pylibraft: + needs: wheel-build-pylibraft + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + 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-24.06 + with: + build_type: pull-request + script: "ci/build_wheel_raft_dask.sh" + wheel-tests-raft-dask: + needs: wheel-build-raft-dask + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + 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-24.06 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 50c0351504..18094cc05a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -40,21 +40,21 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - # wheel-tests-pylibraft: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: nightly - # branch: ${{ inputs.branch }} - # date: ${{ inputs.date }} - # sha: ${{ inputs.sha }} - # script: ci/test_wheel_pylibraft.sh - # wheel-tests-raft-dask: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: nightly - # branch: ${{ inputs.branch }} - # date: ${{ inputs.date }} - # sha: ${{ inputs.sha }} - # script: ci/test_wheel_raft_dask.sh + wheel-tests-pylibraft: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_pylibraft.sh + wheel-tests-raft-dask: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_raft_dask.sh From b0f375d4d73123450b4d9907c4a7598a2a9a5e00 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 26 Apr 2024 16:04:45 -0500 Subject: [PATCH 6/6] more uncommenting --- .github/workflows/pr.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 9a62fa7de3..c2d9556859 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -19,10 +19,10 @@ jobs: - conda-python-build - conda-python-tests - docs-build - # - wheel-build-pylibraft - # - wheel-tests-pylibraft - # - wheel-build-raft-dask - # - wheel-tests-raft-dask + - 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-24.06