From 09507634e9a760422414b414b12aee3d7a51c39f Mon Sep 17 00:00:00 2001 From: rjzamora Date: Mon, 18 Mar 2024 15:26:47 -0700 Subject: [PATCH] set query-planning explicitly to avoid duplicate testing --- ci/test_python_other.sh | 11 +++++------ ci/test_wheel_dask_cudf.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ci/test_python_other.sh b/ci/test_python_other.sh index 8ecd02f70a1..cbc1dc1cb87 100755 --- a/ci/test_python_other.sh +++ b/ci/test_python_other.sh @@ -19,8 +19,8 @@ EXITCODE=0 trap "EXITCODE=1" ERR set +e -rapids-logger "pytest dask_cudf" -./ci/run_dask_cudf_pytests.sh \ +rapids-logger "pytest dask_cudf (dask-expr)" +DASK_DATAFRAME__QUERY_PLANNING=True ./ci/run_dask_cudf_pytests.sh \ --junitxml="${RAPIDS_TESTS_DIR}/junit-dask-cudf.xml" \ --numprocesses=8 \ --dist=worksteal \ @@ -29,10 +29,9 @@ rapids-logger "pytest dask_cudf" --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/dask-cudf-coverage.xml" \ --cov-report=term -# Run tests in dask_cudf/tests and dask_cudf/io/tests with dask-expr -rapids-logger "pytest dask_cudf + dask_expr" -DASK_DATAFRAME__QUERY_PLANNING=True ./ci/run_dask_cudf_pytests.sh \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-dask-cudf-expr.xml" \ +rapids-logger "pytest dask_cudf (legacy)" +DASK_DATAFRAME__QUERY_PLANNING=False ./ci/run_dask_cudf_pytests.sh \ + --junitxml="${RAPIDS_TESTS_DIR}/junit-dask-cudf-legacy.xml" \ --numprocesses=8 \ --dist=loadscope \ . diff --git a/ci/test_wheel_dask_cudf.sh b/ci/test_wheel_dask_cudf.sh index 398eed43ea4..d7fb60e5075 100755 --- a/ci/test_wheel_dask_cudf.sh +++ b/ci/test_wheel_dask_cudf.sh @@ -31,19 +31,19 @@ RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${RESULTS_DIR}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" # Run tests in dask_cudf/tests and dask_cudf/io/tests -rapids-logger "pytest dask_cudf" +rapids-logger "pytest dask_cudf (dask-expr)" pushd python/dask_cudf/dask_cudf -python -m pytest \ +DASK_DATAFRAME__QUERY_PLANNING=True python -m pytest \ --junitxml="${RAPIDS_TESTS_DIR}/junit-dask-cudf.xml" \ --numprocesses=8 \ . popd -# Run tests in dask_cudf/tests and dask_cudf/io/tests with dask-expr -rapids-logger "pytest dask_cudf + dask_expr" +# Run tests in dask_cudf/tests and dask_cudf/io/tests (legacy) +rapids-logger "pytest dask_cudf (legacy)" pushd python/dask_cudf/dask_cudf -DASK_DATAFRAME__QUERY_PLANNING=True python -m pytest \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-dask-cudf-expr.xml" \ +DASK_DATAFRAME__QUERY_PLANNING=False python -m pytest \ + --junitxml="${RAPIDS_TESTS_DIR}/junit-dask-cudf-legacy.xml" \ --numprocesses=8 \ . popd