From b2be7e59560bc5af28e05d0756477fe56600d484 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 4 Mar 2024 12:34:44 -0600 Subject: [PATCH 1/5] Test with gha-tools fork. --- ci/build_cpp.sh | 5 +++++ ci/build_docs.sh | 5 +++++ ci/build_python.sh | 5 +++++ ci/build_wheel.sh | 5 +++++ ci/check_style.sh | 5 +++++ ci/test_cpp_common.sh | 7 ++++++- ci/test_java.sh | 7 ++++++- ci/test_notebooks.sh | 7 ++++++- ci/test_python_common.sh | 7 ++++++- ci/test_wheel_cudf.sh | 5 +++++ ci/test_wheel_dask_cudf.sh | 5 +++++ 11 files changed, 59 insertions(+), 4 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 740a6409ccd..461eab2aac0 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -3,6 +3,11 @@ set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + rapids-configure-conda-channels source rapids-configure-sccache diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 529eaeae696..5a1f9ea8552 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -3,6 +3,11 @@ set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + export RAPIDS_VERSION_NUMBER="$(rapids-generate-version)" rapids-logger "Create test conda environment" diff --git a/ci/build_python.sh b/ci/build_python.sh index 3c2a7761e1a..879f88cb0f7 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -3,6 +3,11 @@ set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + rapids-configure-conda-channels source rapids-configure-sccache diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index c4b794e81f7..d9c1c96155c 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -3,6 +3,11 @@ set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + package_name=$1 package_dir=$2 diff --git a/ci/check_style.sh b/ci/check_style.sh index 8d882743fcc..55c6d4f8deb 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -3,6 +3,11 @@ set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + rapids-logger "Create checks conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/test_cpp_common.sh b/ci/test_cpp_common.sh index 163d381c1d4..a4eb62e817c 100644 --- a/ci/test_cpp_common.sh +++ b/ci/test_cpp_common.sh @@ -1,8 +1,13 @@ #!/bin/bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate C++ testing dependencies" diff --git a/ci/test_java.sh b/ci/test_java.sh index 0863795162d..b757a5ab3ad 100755 --- a/ci/test_java.sh +++ b/ci/test_java.sh @@ -1,8 +1,13 @@ #!/bin/bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate Java testing dependencies" diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index b746a18aed1..ce650070814 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -1,8 +1,13 @@ #!/bin/bash -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate notebook testing dependencies" diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 1c330d47ac6..266328e6cf2 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -1,10 +1,15 @@ #!/bin/bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Common setup steps shared by Python test jobs set -euo pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate Python testing dependencies" diff --git a/ci/test_wheel_cudf.sh b/ci/test_wheel_cudf.sh index b7e8f862ed5..b27b6ec0eb5 100755 --- a/ci/test_wheel_cudf.sh +++ b/ci/test_wheel_cudf.sh @@ -3,6 +3,11 @@ set -eou pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + # Set the manylinux version used for downloading the wheels so that we test the # newer ABI wheels on the newer images that support their installation. # Need to disable pipefail for the head not to fail, see diff --git a/ci/test_wheel_dask_cudf.sh b/ci/test_wheel_dask_cudf.sh index 74fcb43ddca..265986040e4 100755 --- a/ci/test_wheel_dask_cudf.sh +++ b/ci/test_wheel_dask_cudf.sh @@ -3,6 +3,11 @@ set -eou pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist From eb5b6c5896194797e64e7258ef2081555d319f84 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 4 Mar 2024 12:36:32 -0600 Subject: [PATCH 2/5] Mark dask-cudf as a pure wheel. --- ci/build_wheel_dask_cudf.sh | 2 +- ci/test_wheel_dask_cudf.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_wheel_dask_cudf.sh b/ci/build_wheel_dask_cudf.sh index b09c1e51271..150fec4e2d7 100755 --- a/ci/build_wheel_dask_cudf.sh +++ b/ci/build_wheel_dask_cudf.sh @@ -8,4 +8,4 @@ package_dir="python/dask_cudf" ./ci/build_wheel.sh dask-cudf ${package_dir} RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 ${package_dir}/dist +RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 ${package_dir}/dist diff --git a/ci/test_wheel_dask_cudf.sh b/ci/test_wheel_dask_cudf.sh index 265986040e4..48d1472082a 100755 --- a/ci/test_wheel_dask_cudf.sh +++ b/ci/test_wheel_dask_cudf.sh @@ -9,7 +9,7 @@ unzip wheel-python-pure.zip cp gha-tools-wheel-python-pure/tools/* /usr/local/bin RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist +RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist # Download the cudf built in the previous step # Set the manylinux version used for downloading the wheels so that we test the From 1bc6361cef1d6673345d57d587442a7b4a4dbf02 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 4 Mar 2024 14:15:13 -0600 Subject: [PATCH 3/5] Use fork for cudf.pandas unit tests. --- ci/cudf_pandas_scripts/run_tests.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/cudf_pandas_scripts/run_tests.sh b/ci/cudf_pandas_scripts/run_tests.sh index 4f1e4bbf993..c4cc121d036 100755 --- a/ci/cudf_pandas_scripts/run_tests.sh +++ b/ci/cudf_pandas_scripts/run_tests.sh @@ -1,10 +1,15 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. +# SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. # All rights reserved. # SPDX-License-Identifier: Apache-2.0 set -eoxu pipefail +# Use gha-tools fork +wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip +unzip wheel-python-pure.zip +cp gha-tools-wheel-python-pure/tools/* /usr/local/bin + # Function to display script usage function display_usage { echo "Usage: $0 [--no-cudf]" From 625487565f6a7f819a1575c0165342a11baaccaa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 5 Mar 2024 13:45:38 -0800 Subject: [PATCH 4/5] Revert gha-tools fork. --- ci/build_cpp.sh | 5 ----- ci/build_docs.sh | 5 ----- ci/build_python.sh | 5 ----- ci/build_wheel.sh | 5 ----- ci/check_style.sh | 5 ----- ci/cudf_pandas_scripts/run_tests.sh | 5 ----- ci/test_cpp_common.sh | 5 ----- ci/test_java.sh | 5 ----- ci/test_notebooks.sh | 5 ----- ci/test_python_common.sh | 5 ----- ci/test_wheel_cudf.sh | 5 ----- ci/test_wheel_dask_cudf.sh | 5 ----- 12 files changed, 60 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 461eab2aac0..740a6409ccd 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - rapids-configure-conda-channels source rapids-configure-sccache diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 5a1f9ea8552..529eaeae696 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - export RAPIDS_VERSION_NUMBER="$(rapids-generate-version)" rapids-logger "Create test conda environment" diff --git a/ci/build_python.sh b/ci/build_python.sh index 879f88cb0f7..3c2a7761e1a 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - rapids-configure-conda-channels source rapids-configure-sccache diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index d9c1c96155c..c4b794e81f7 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - package_name=$1 package_dir=$2 diff --git a/ci/check_style.sh b/ci/check_style.sh index 55c6d4f8deb..8d882743fcc 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - rapids-logger "Create checks conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/cudf_pandas_scripts/run_tests.sh b/ci/cudf_pandas_scripts/run_tests.sh index c4cc121d036..4099b58b4ba 100755 --- a/ci/cudf_pandas_scripts/run_tests.sh +++ b/ci/cudf_pandas_scripts/run_tests.sh @@ -5,11 +5,6 @@ set -eoxu pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - # Function to display script usage function display_usage { echo "Usage: $0 [--no-cudf]" diff --git a/ci/test_cpp_common.sh b/ci/test_cpp_common.sh index a4eb62e817c..fdee8df9538 100644 --- a/ci/test_cpp_common.sh +++ b/ci/test_cpp_common.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate C++ testing dependencies" diff --git a/ci/test_java.sh b/ci/test_java.sh index b757a5ab3ad..59073756a00 100755 --- a/ci/test_java.sh +++ b/ci/test_java.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate Java testing dependencies" diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index ce650070814..b46d077891e 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -3,11 +3,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate notebook testing dependencies" diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 266328e6cf2..508f8625fa7 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -5,11 +5,6 @@ set -euo pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - . /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate Python testing dependencies" diff --git a/ci/test_wheel_cudf.sh b/ci/test_wheel_cudf.sh index b27b6ec0eb5..b7e8f862ed5 100755 --- a/ci/test_wheel_cudf.sh +++ b/ci/test_wheel_cudf.sh @@ -3,11 +3,6 @@ set -eou pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - # Set the manylinux version used for downloading the wheels so that we test the # newer ABI wheels on the newer images that support their installation. # Need to disable pipefail for the head not to fail, see diff --git a/ci/test_wheel_dask_cudf.sh b/ci/test_wheel_dask_cudf.sh index 48d1472082a..59f6ecd8483 100755 --- a/ci/test_wheel_dask_cudf.sh +++ b/ci/test_wheel_dask_cudf.sh @@ -3,11 +3,6 @@ set -eou pipefail -# Use gha-tools fork -wget https://github.com/bdice/gha-tools/archive/refs/heads/wheel-python-pure.zip -unzip wheel-python-pure.zip -cp gha-tools-wheel-python-pure/tools/* /usr/local/bin - RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist From eebdbd632517567cc3ea3bfb2dd1c202d1664cfe Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 5 Mar 2024 13:47:30 -0800 Subject: [PATCH 5/5] Revert copyright years. --- ci/cudf_pandas_scripts/run_tests.sh | 2 +- ci/test_cpp_common.sh | 2 +- ci/test_java.sh | 2 +- ci/test_notebooks.sh | 2 +- ci/test_python_common.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/cudf_pandas_scripts/run_tests.sh b/ci/cudf_pandas_scripts/run_tests.sh index 4099b58b4ba..4f1e4bbf993 100755 --- a/ci/cudf_pandas_scripts/run_tests.sh +++ b/ci/cudf_pandas_scripts/run_tests.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. +# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. # All rights reserved. # SPDX-License-Identifier: Apache-2.0 diff --git a/ci/test_cpp_common.sh b/ci/test_cpp_common.sh index fdee8df9538..163d381c1d4 100644 --- a/ci/test_cpp_common.sh +++ b/ci/test_cpp_common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. set -euo pipefail diff --git a/ci/test_java.sh b/ci/test_java.sh index 59073756a00..0863795162d 100755 --- a/ci/test_java.sh +++ b/ci/test_java.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. set -euo pipefail diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index b46d077891e..b746a18aed1 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020-2024, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. set -euo pipefail diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 508f8625fa7..1c330d47ac6 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # Common setup steps shared by Python test jobs