diff --git a/ci/cudf_pandas_scripts/run_tests.sh b/ci/cudf_pandas_scripts/run_tests.sh index 38cc785af00..5f34a7d1ed0 100755 --- a/ci/cudf_pandas_scripts/run_tests.sh +++ b/ci/cudf_pandas_scripts/run_tests.sh @@ -61,6 +61,7 @@ else "$(echo ./dist/pylibcudf_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" fi +# We're ignoring third-party library tests because they are run nightly in a seperate CI job python -m pytest -p cudf.pandas \ --ignore=./python/cudf/cudf_pandas_tests/third_party_integration_tests/ \ --cov-config=./python/cudf/.coveragerc \ diff --git a/ci/cudf_pandas_scripts/third-party-integration/ci_run_library_tests.sh b/ci/cudf_pandas_scripts/third-party-integration/ci_run_library_tests.sh deleted file mode 100755 index 44273fb44cf..00000000000 --- a/ci/cudf_pandas_scripts/third-party-integration/ci_run_library_tests.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. -# All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -cleanup() { - rm ${TEST_DIR}/results-*.pickle -} - -trap cleanup EXIT - -runtest() { - local lib=$1 - local use_cudf_pandas=$2 - local pytest_args="" - - if [ "$use_cudf_pandas" = true ]; then - local pytest_args="-p cudf.pandas" - fi - - pytest \ - $pytest_args \ - -v \ - --cache-clear \ - --numprocesses=${NUM_PROCESSES} \ - --dist=worksteal \ - ${TEST_DIR}/test_${lib}*.py \ -} - -main() { - local lib=$1 - - # generation phase - runtest ${lib} false - runtest ${lib} true - - # assertion phase - pytest \ - --compare \ - -p cudf.pandas \ - -v \ - --cache-clear \ - --numprocesses=${NUM_PROCESSES} \ - --dist=worksteal \ - ${TEST_DIR}/test_${lib}*.py \ -} - -main $@ diff --git a/ci/cudf_pandas_scripts/third-party-integration/test.sh b/ci/cudf_pandas_scripts/third-party-integration/test.sh index 5f39c66a43d..82eddc85490 100755 --- a/ci/cudf_pandas_scripts/third-party-integration/test.sh +++ b/ci/cudf_pandas_scripts/third-party-integration/test.sh @@ -5,6 +5,9 @@ set -euo pipefail +repo_root=$(git rev-parse --show-toplevel) +TEST_DIR=${repo_root}/python/cudf/cudf_pandas_tests/third_party_integration_tests/tests + extract_lib_from_dependencies_yaml() { local file=$1 # Parse all keys in dependencies.yaml under the "files" section, @@ -67,9 +70,6 @@ main() { conda activate test set -u - repo_root=$(git rev-parse --show-toplevel) - TEST_DIR=${repo_root}/python/cudf/cudf_pandas_tests/third_party_integration_tests/tests - rapids-print-env rapids-logger "Check GPU usage"