diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a5c44b0c2..b81623d18 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -26,7 +26,7 @@ jobs: - devcontainer - telemetry-setup secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@test-github-artifacts if: always() with: needs: ${{ toJSON(needs) }} @@ -57,7 +57,7 @@ jobs: needs: - telemetry-setup secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@test-github-artifacts with: files_yaml: | test_cpp: @@ -79,40 +79,40 @@ jobs: secrets: inherit needs: - telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@test-github-artifacts with: enable_check_generated_files: false ignored_pr_jobs: telemetry-summarize conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@test-github-artifacts with: build_type: pull-request conda-cpp-tests: needs: [conda-cpp-build, changed-files] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@test-github-artifacts if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp with: build_type: pull-request conda-python-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@test-github-artifacts 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.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@test-github-artifacts 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.04 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@test-github-artifacts with: build_type: pull-request node_type: "gpu-l4-latest-1" @@ -122,22 +122,24 @@ jobs: wheel-build-cpp: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-github-artifacts with: matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) build_type: pull-request script: ci/build_wheel_cpp.sh + wheel_type: cpp wheel-build-python: needs: wheel-build-cpp secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@test-github-artifacts with: build_type: pull-request script: ci/build_wheel_python.sh + wheel_type: python wheel-tests: needs: [wheel-build-python, changed-files] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@test-github-artifacts if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request @@ -146,7 +148,7 @@ jobs: secrets: inherit needs: - telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@test-github-artifacts with: arch: '["amd64"]' cuda: '["12.8"]' diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 1ab555bc0..e53492906 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -21,4 +21,4 @@ RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild sccache --show-adv-stats -rapids-upload-conda-to-s3 cpp +# rapids-upload-conda-to-s3 cpp diff --git a/ci/build_docs.sh b/ci/build_docs.sh index a3562d973..82e62d9db 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -22,8 +22,8 @@ conda activate docs rapids-print-env rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +PYTHON_CHANNEL=$(rapids-download-conda-from-github python) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ diff --git a/ci/build_python.sh b/ci/build_python.sh index 98f57c34b..607cd4cc3 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,7 +16,7 @@ rapids-generate-version > ./VERSION rapids-logger "Begin py build" -CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +CPP_CHANNEL=$(rapids-download-conda-from-github cpp) sccache --zero-stats @@ -25,4 +25,4 @@ RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild -c "${ sccache --show-adv-stats -rapids-upload-conda-to-s3 python +# rapids-upload-conda-to-s3 python diff --git a/ci/build_wheel_cpp.sh b/ci/build_wheel_cpp.sh index 9396e9cc5..a4d2efb56 100755 --- a/ci/build_wheel_cpp.sh +++ b/ci/build_wheel_cpp.sh @@ -4,24 +4,25 @@ set -euo pipefail package_dir="python/librmm" +wheel_dir=${RAPIDS_WHEEL_DIR:-"dist"} source rapids-configure-sccache source rapids-date-string rapids-generate-version > ./VERSION -RAPIDS_PY_CUDA_SUFFIX=$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}") +# RAPIDS_PY_CUDA_SUFFIX=$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}") cd "${package_dir}" sccache --zero-stats -rapids-pip-retry wheel . -w dist -v --no-deps --disable-pip-version-check +rapids-pip-retry wheel . -w "${wheel_dir}" -v --no-deps --disable-pip-version-check sccache --show-adv-stats -python -m wheel tags --platform any dist/* --remove +python -m wheel tags --platform any "${wheel_dir}"/* --remove -../../ci/validate_wheel.sh dist +../../ci/validate_wheel.sh "${wheel_dir}" -RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 cpp dist +# RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 cpp dist diff --git a/ci/build_wheel_python.sh b/ci/build_wheel_python.sh index 3fff53dfe..9b62888d2 100755 --- a/ci/build_wheel_python.sh +++ b/ci/build_wheel_python.sh @@ -3,9 +3,11 @@ set -euo pipefail -package_name="rmm" +# package_name="rmm" package_dir="python/rmm" +wheel_dir=${RAPIDS_WHEEL_DIR:-"final_dist"} + source rapids-configure-sccache source rapids-date-string @@ -14,7 +16,7 @@ rapids-generate-version > ./VERSION pushd "${package_dir}" RAPIDS_PY_CUDA_SUFFIX=$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}") -CPP_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/librmm_dist) +CPP_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) # ensure 'rmm' wheel builds always use the 'librmm' just built in the same CI run # @@ -33,12 +35,13 @@ mkdir -p final_dist EXCLUDE_ARGS=( --exclude "librapids_logger.so" ) -python -m auditwheel repair "${EXCLUDE_ARGS[@]}" -w final_dist dist/* +python -m auditwheel repair "${EXCLUDE_ARGS[@]}" -w "${wheel_dir}" dist/* -../../ci/validate_wheel.sh final_dist +../../ci/validate_wheel.sh "${wheel_dir}" -RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python final_dist +# RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python final_dist +absolute_wheel_dir=$(realpath "${wheel_dir}") # switch back to the root of the repo and check symbol visibility popd -ci/check_symbols.sh "$(echo ${package_dir}/final_dist/rmm_*.whl)" +ci/check_symbols.sh "$(echo ${absolute_wheel_dir}/rmm_*.whl)" diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index e0612c94b..505266377 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -23,7 +23,7 @@ set +u conda activate test set -u -CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +CPP_CHANNEL=$(rapids-download-conda-from-github cpp) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" diff --git a/ci/test_python.sh b/ci/test_python.sh index 377882c59..53a298192 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -25,8 +25,8 @@ set -u rapids-print-env rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +PYTHON_CHANNEL=$(rapids-download-conda-from-github python) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index ef53afa12..33d3ff507 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -4,9 +4,9 @@ set -eou pipefail RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -WHEELHOUSE="${PWD}/dist/" -RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp "${WHEELHOUSE}" -RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python "${WHEELHOUSE}" +# WHEELHOUSE="${PWD}/dist/" +CPP_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="rmm_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github python) # generate constraints (possibly pinning to oldest support versions of dependencies) rapids-generate-pip-constraints test_python ./constraints.txt @@ -15,7 +15,7 @@ rapids-generate-pip-constraints test_python ./constraints.txt rapids-pip-retry install \ -v \ --constraint ./constraints.txt \ - "$(echo "${WHEELHOUSE}"/librmm_"${RAPIDS_PY_CUDA_SUFFIX}"*.whl)" \ + "$(echo "${CPP_WHEELHOUSE}"/librmm_"${RAPIDS_PY_CUDA_SUFFIX}"*.whl)" \ "$(echo "${WHEELHOUSE}"/rmm_"${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" python -m pytest ./python/rmm/rmm/tests