Skip to content

Commit

Permalink
Make ci/run_cuml_dask_pytests.sh environment-agnostic again (#5950)
Browse files Browse the repository at this point in the history
Make `ci/run_cuml_dask_pytests.sh` environment-agnostic again. This script is run outside the RAPIDS CI environment, so it should not include calls to utilities only available in that environment. Follow-up to #5761.

Authors:
  - Paul Taylor (https://github.com/trxcllnt)
  - Dante Gama Dessavre (https://github.com/dantegd)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - James Lamb (https://github.com/jameslamb)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #5950
  • Loading branch information
trxcllnt authored Jul 28, 2024
1 parent bc6f9b6 commit 3320895
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
9 changes: 1 addition & 8 deletions ci/run_cuml_dask_pytests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,4 @@
# Support invoking run_cuml_dask_pytests.sh outside the script directory
cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/cuml/cuml/tests/dask

rapids-logger "pytest cuml-dask (No UCX-Py/UCXX)"
timeout 2h python -m pytest --cache-clear "$@" .

rapids-logger "pytest cuml-dask (UCX-Py only)"
timeout 5m python -m pytest --cache-clear --run_ucx "$@" .

rapids-logger "pytest cuml-dask (UCXX only)"
timeout 5m python -m pytest --cache-clear --run_ucxx "$@" .
python -m pytest --cache-clear "$@" .
22 changes: 16 additions & 6 deletions ci/test_python_dask.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,23 @@ EXITCODE=0
trap "EXITCODE=1" ERR
set +e

# Run tests
./ci/run_cuml_dask_pytests.sh \
--junitxml="${RAPIDS_TESTS_DIR}/junit-cuml-dask.xml" \
--cov-config=../../../.coveragerc \
--cov=cuml_dask \
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuml-dask-coverage.xml" \
test_args=(
--junitxml="${RAPIDS_TESTS_DIR}/junit-cuml-dask.xml"
--cov-config=../../../.coveragerc
--cov=cuml_dask
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuml-dask-coverage.xml"
--cov-report=term
)

# Run tests
rapids-logger "pytest cuml-dask (No UCX-Py/UCXX)"
timeout 2h ./ci/run_cuml_dask_pytests.sh "${test_args[@]}"

rapids-logger "pytest cuml-dask (UCX-Py only)"
timeout 5m ./ci/run_cuml_dask_pytests.sh "${test_args[@]}" --run_ucx

rapids-logger "pytest cuml-dask (UCXX only)"
timeout 5m ./ci/run_cuml_dask_pytests.sh "${test_args[@]}" --run_ucxx

rapids-logger "Test script exiting with value: $EXITCODE"
exit ${EXITCODE}

0 comments on commit 3320895

Please sign in to comment.