From 8ca0180e2599c6ca1129bee6e5925572f86f6562 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Sep 2024 13:09:19 -0500 Subject: [PATCH] run all CI --- .github/workflows/pr.yaml | 182 +++++++++++++++--------------- ci/build_cpp.sh | 3 +- ci/test_cpp.sh | 3 +- ci/test_notebooks.sh | 3 +- ci/test_python_common.sh | 3 +- ci/use_conda_packages_from_prs.sh | 1 + ci/use_wheels_from_prs.sh | 1 + 7 files changed, 97 insertions(+), 99 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4ec3bb6e39..c0c0601afb 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,108 +12,108 @@ concurrency: jobs: pr-builder: needs: - # - checks - # - clang-tidy + - checks + - clang-tidy - conda-cpp-build - # - conda-cpp-tests - # - conda-cpp-checks + - conda-cpp-tests + - conda-cpp-checks - conda-python-build - # - conda-python-tests-singlegpu - # - conda-python-tests-dask - # - conda-notebook-tests - # - docs-build + - conda-python-tests-singlegpu + - conda-python-tests-dask + - conda-notebook-tests + - docs-build - wheel-build-cuml - # - wheel-tests-cuml + - wheel-tests-cuml - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 - # checks: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 - # with: - # enable_check_generated_files: false - # ignored_pr_jobs: >- - # optional-job-conda-python-tests-cudf-pandas-integration - # clang-tidy: - # needs: checks - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "cpu8" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10" - # run_script: "ci/run_clang_tidy.sh" + checks: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 + with: + enable_check_generated_files: false + ignored_pr_jobs: >- + optional-job-conda-python-tests-cudf-pandas-integration + clang-tidy: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "cpu8" + arch: "amd64" + container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10" + run_script: "ci/run_clang_tidy.sh" conda-cpp-build: - # needs: checks + needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 with: build_type: pull-request - # conda-cpp-tests: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - # 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-24.10 - # with: - # build_type: pull-request - # enable_check_symbols: true - # symbol_exclusions: raft_cutlass + conda-cpp-tests: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 + 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-24.10 + with: + build_type: pull-request + enable_check_symbols: true + symbol_exclusions: raft_cutlass conda-python-build: needs: conda-cpp-build secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 with: build_type: pull-request - # conda-python-tests-singlegpu: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: "ci/test_python_singlegpu.sh" - # optional-job-conda-python-tests-cudf-pandas-integration: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # matrix_filter: map(select(.ARCH == "amd64")) - # build_type: pull-request - # script: "ci/test_python_integration.sh" - # conda-python-tests-dask: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: "ci/test_python_dask.sh" - # conda-notebook-tests: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/test_notebooks.sh" - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # 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" + conda-python-tests-singlegpu: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + with: + build_type: pull-request + script: "ci/test_python_singlegpu.sh" + optional-job-conda-python-tests-cudf-pandas-integration: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + with: + matrix_filter: map(select(.ARCH == "amd64")) + build_type: pull-request + script: "ci/test_python_integration.sh" + conda-python-tests-dask: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + with: + build_type: pull-request + script: "ci/test_python_dask.sh" + conda-notebook-tests: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/test_notebooks.sh" + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + 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-cuml: - # needs: checks + needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: @@ -122,13 +122,13 @@ jobs: extra-repo: rapidsai/cumlprims_mg extra-repo-sha: branch-24.10 extra-repo-deploy-key: CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY - # wheel-tests-cuml: - # needs: wheel-build-cuml - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: ci/test_wheel.sh + wheel-tests-cuml: + needs: wheel-build-cuml + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + with: + build_type: pull-request + script: ci/test_wheel.sh devcontainer: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 826f4de391..4fdc896d37 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -18,7 +18,6 @@ rapids-print-env rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \ - conda/recipes/libcuml +RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcuml rapids-upload-conda-to-s3 cpp diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 8a7849b4a9..f64ac32b0d 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -18,8 +18,7 @@ rapids-dependency-file-generator \ --output conda \ --file-key test_cpp \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \ - --prepend-channel "${CPP_CHANNEL}" \ -| tee env.yaml + --prepend-channel "${CPP_CHANNEL}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 05a38da286..b4682a26bd 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -15,8 +15,7 @@ rapids-dependency-file-generator \ --file-key test_notebooks \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \ --prepend-channel "${CPP_CHANNEL}" \ - --prepend-channel "${PYTHON_CHANNEL}" \ -| tee env.yaml + --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 85bef07828..1cc93540cd 100644 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -16,8 +16,7 @@ rapids-dependency-file-generator \ --file-key test_python \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \ --prepend-channel "${CPP_CHANNEL}" \ - --prepend-channel "${PYTHON_CHANNEL}" \ -| tee env.yaml + --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh index 2001081b6c..162421396c 100755 --- a/ci/use_conda_packages_from_prs.sh +++ b/ci/use_conda_packages_from_prs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright (c) 2024, NVIDIA CORPORATION. LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp) RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python) diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh index 7a49b492fd..b74fa3a912 100644 --- a/ci/use_wheels_from_prs.sh +++ b/ci/use_wheels_from_prs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright (c) 2024, NVIDIA CORPORATION. RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"