diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1e27f590908..67c451fbd6e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -72,7 +72,6 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 with: build_type: ${{ inputs.build_type || 'branch' }} - build-2_28-wheels: "true" branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 224e5221a5b..303988212d3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -114,7 +114,6 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 with: build_type: pull-request - build-2_28-wheels: "true" script: "ci/build_wheel_cudf.sh" wheel-tests-cudf: needs: wheel-build-cudf diff --git a/ci/build_wheel_cudf.sh b/ci/build_wheel_cudf.sh index cde22bb70d1..f0886a28fd9 100755 --- a/ci/build_wheel_cudf.sh +++ b/ci/build_wheel_cudf.sh @@ -13,4 +13,4 @@ python -m auditwheel repair -w ${package_dir}/final_dist ${package_dir}/dist/* RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -RAPIDS_PY_WHEEL_NAME="cudf_${AUDITWHEEL_POLICY}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 ${package_dir}/final_dist +RAPIDS_PY_WHEEL_NAME="cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 ${package_dir}/final_dist diff --git a/ci/cudf_pandas_scripts/pandas-tests/run.sh b/ci/cudf_pandas_scripts/pandas-tests/run.sh index f3c37ecde26..1f70ca78c41 100755 --- a/ci/cudf_pandas_scripts/pandas-tests/run.sh +++ b/ci/cudf_pandas_scripts/pandas-tests/run.sh @@ -10,21 +10,8 @@ PANDAS_TESTS_BRANCH=${1} rapids-logger "Running Pandas tests using $PANDAS_TESTS_BRANCH branch" rapids-logger "PR number: ${RAPIDS_REF_NAME:-"unknown"}" -# 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 -# https://stackoverflow.com/questions/19120263/why-exit-code-141-with-grep-q -set +o pipefail -glibc_minor_version=$(ldd --version | head -1 | grep -o "[0-9]\.[0-9]\+" | tail -1 | cut -d '.' -f2) -set -o pipefail -manylinux_version="2_17" -if [[ ${glibc_minor_version} -ge 28 ]]; then - manylinux_version="2_28" -fi -manylinux="manylinux_${manylinux_version}" - RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -RAPIDS_PY_WHEEL_NAME="cudf_${manylinux}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep +RAPIDS_PY_WHEEL_NAME="cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep python -m pip install $(ls ./local-cudf-dep/cudf*.whl)[test,pandas-tests] RESULTS_DIR=${RAPIDS_TESTS_DIR:-"$(mktemp -d)"} diff --git a/ci/cudf_pandas_scripts/run_tests.sh b/ci/cudf_pandas_scripts/run_tests.sh index 4f1e4bbf993..78945d37f22 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 NVIDIA CORPORATION & AFFILIATES. +# SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. # All rights reserved. # SPDX-License-Identifier: Apache-2.0 @@ -31,21 +31,8 @@ done if [ "$no_cudf" = true ]; then echo "Skipping cudf install" else - # 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 - # https://stackoverflow.com/questions/19120263/why-exit-code-141-with-grep-q - set +o pipefail - glibc_minor_version=$(ldd --version | head -1 | grep -o "[0-9]\.[0-9]\+" | tail -1 | cut -d '.' -f2) - set -o pipefail - manylinux_version="2_17" - if [[ ${glibc_minor_version} -ge 28 ]]; then - manylinux_version="2_28" - fi - manylinux="manylinux_${manylinux_version}" - RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" - RAPIDS_PY_WHEEL_NAME="cudf_${manylinux}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep + RAPIDS_PY_WHEEL_NAME="cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep python -m pip install $(ls ./local-cudf-dep/cudf*.whl)[test,cudf-pandas-tests] fi diff --git a/ci/test_wheel_cudf.sh b/ci/test_wheel_cudf.sh index af5779f478a..83f0b976128 100755 --- a/ci/test_wheel_cudf.sh +++ b/ci/test_wheel_cudf.sh @@ -3,21 +3,8 @@ set -eou pipefail -# 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 -# https://stackoverflow.com/questions/19120263/why-exit-code-141-with-grep-q -set +o pipefail -glibc_minor_version=$(ldd --version | head -1 | grep -o "[0-9]\.[0-9]\+" | tail -1 | cut -d '.' -f2) -set -o pipefail -manylinux_version="2_17" -if [[ ${glibc_minor_version} -ge 28 ]]; then - manylinux_version="2_28" -fi -manylinux="manylinux_${manylinux_version}" - RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -RAPIDS_PY_WHEEL_NAME="cudf_${manylinux}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist +RAPIDS_PY_WHEEL_NAME="cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/cudf*.whl)[test] diff --git a/ci/test_wheel_dask_cudf.sh b/ci/test_wheel_dask_cudf.sh index d7fb60e5075..2b20b9d9ce4 100755 --- a/ci/test_wheel_dask_cudf.sh +++ b/ci/test_wheel_dask_cudf.sh @@ -7,20 +7,7 @@ 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 # Download the cudf built in the previous step -# 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 -# https://stackoverflow.com/questions/19120263/why-exit-code-141-with-grep-q -set +o pipefail -glibc_minor_version=$(ldd --version | head -1 | grep -o "[0-9]\.[0-9]\+" | tail -1 | cut -d '.' -f2) -set -o pipefail -manylinux_version="2_17" -if [[ ${glibc_minor_version} -ge 28 ]]; then - manylinux_version="2_28" -fi -manylinux="manylinux_${manylinux_version}" - -RAPIDS_PY_WHEEL_NAME="cudf_${manylinux}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep +RAPIDS_PY_WHEEL_NAME="cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep python -m pip install --no-deps ./local-cudf-dep/cudf*.whl # echo to expand wildcard before adding `[extra]` requires for pip diff --git a/cpp/cmake/thirdparty/get_arrow.cmake b/cpp/cmake/thirdparty/get_arrow.cmake index 114a1f98a68..892056959c8 100644 --- a/cpp/cmake/thirdparty/get_arrow.cmake +++ b/cpp/cmake/thirdparty/get_arrow.cmake @@ -68,37 +68,6 @@ list(POP_BACK CMAKE_PREFIX_PATH) find_package(Arrow ${PYARROW_VERSION} MODULE REQUIRED GLOBAL) add_library(arrow_shared ALIAS Arrow::Arrow) - # When using the libarrow inside a wheel, whether or not libcudf may be built using the new C++11 - # ABI is dependent on whether the libarrow inside the wheel was compiled using that ABI because we - # need the arrow library that we bundle in cudf to be ABI-compatible with the one inside pyarrow. - # We determine what options to use by checking the glibc version on the current system, which is - # also how pip determines which manylinux-versioned pyarrow wheel to install. Note that tests will - # not build successfully without also propagating these options to builds of GTest. Similarly, - # benchmarks will not work without updating GBench (and possibly NVBench) builds. We are currently - # ignoring these limitations since we don't anticipate using this feature except for building - # wheels. - enable_language(C) - execute_process( - COMMAND ${CMAKE_C_COMPILER} -print-file-name=libc.so.6 - OUTPUT_VARIABLE GLIBC_EXECUTABLE - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - execute_process( - COMMAND ${GLIBC_EXECUTABLE} - OUTPUT_VARIABLE GLIBC_OUTPUT - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - string(REGEX MATCH "stable release version ([0-9]+\\.[0-9]+)" GLIBC_VERSION ${GLIBC_OUTPUT}) - string(REPLACE "stable release version " "" GLIBC_VERSION ${GLIBC_VERSION}) - string(REPLACE "." ";" GLIBC_VERSION_LIST ${GLIBC_VERSION}) - list(GET GLIBC_VERSION_LIST 1 GLIBC_VERSION_MINOR) - if(GLIBC_VERSION_MINOR LESS 28) - target_compile_options( - Arrow::Arrow INTERFACE "$<$:-D_GLIBCXX_USE_CXX11_ABI=0>" - "$<$:-Xcompiler=-D_GLIBCXX_USE_CXX11_ABI=0>" - ) - endif() - rapids_export_package(BUILD Arrow cudf-exports) rapids_export_package(INSTALL Arrow cudf-exports) endfunction()