xfail pytorch test and move integration tests out of cudf_pandas_tests

rapidsai · Aug 27, 2024 · 8ffbc2f · 8ffbc2f
1 parent 8443f55
commit 8ffbc2f
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -239,12 +239,12 @@ jobs:
       arch: "amd64"
       container_image: "rapidsai/ci-conda:latest"
       run_script: |
-        LIBS=$(python/cudf/cudf_pandas_tests/third_party_integration_tests/ci/extract_lib.sh python/cudf/cudf_pandas_tests/third_party_integration_tests/dependencies.yaml)
+        LIBS=$(python/cudf/cudf_pandas_third_party_integration_tests/ci/extract_lib.sh python/cudf/cudf_pandas_third_party_integration_tests/dependencies.yaml)
         LIBS=${LIBS#[}
         LIBS=${LIBS%]}
         for lib in ${LIBS//,/ }; do
           lib=$(echo "$lib" | tr -d '""')
           echo "Running tests for $lib"
           CUDA_MAJOR=$(if [ "$lib" = "tensorflow" ]; then echo "11"; else echo "12"; fi)
-          python/cudf/cudf_pandas_tests/third_party_integration_tests/ci/test.sh $lib $CUDA_MAJOR
+          python/cudf/cudf_pandas_third_party_integration_tests/ci/test.sh $lib $CUDA_MAJOR
         done
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -134,12 +134,12 @@ jobs:
       sha: ${{ inputs.sha }}
       container_image: "rapidsai/ci-conda:latest"
       run_script: |
-        LIBS=$(python/cudf/cudf_pandas_tests/third_party_integration_tests/ci/extract_lib.sh python/cudf/cudf_pandas_tests/third_party_integration_tests/dependencies.yaml)
+        LIBS=$(python/cudf/cudf_pandas_third_party_integration_tests/ci/extract_lib.sh python/cudf/cudf_pandas_third_party_integration_tests/dependencies.yaml)
         LIBS=${LIBS#[}
         LIBS=${LIBS%]}
         for lib in ${LIBS//,/ }; do
           lib=$(echo "$lib" | tr -d '""')
           echo "Running tests for $lib"
           CUDA_MAJOR=$(if [ "$lib" = "tensorflow" ]; then echo "11"; else echo "12"; fi)
-          python/cudf/cudf_pandas_tests/third_party_integration_tests/ci/test.sh $lib $CUDA_MAJOR
+          python/cudf/cudf_pandas_third_party_integration_tests/ci/test.sh $lib $CUDA_MAJOR
         done
diff --git a/...egration_tests/ci/ci_run_library_tests.sh → ...egration_tests/ci/ci_run_library_tests.sh b/...egration_tests/ci/ci_run_library_tests.sh → ...egration_tests/ci/ci_run_library_tests.sh
diff --git a/...party_integration_tests/ci/extract_lib.sh → ...party_integration_tests/ci/extract_lib.sh b/...party_integration_tests/ci/extract_lib.sh → ...party_integration_tests/ci/extract_lib.sh
diff --git a/.../third_party_integration_tests/ci/test.sh → ..._third_party_integration_tests/ci/test.sh b/.../third_party_integration_tests/ci/test.sh → ..._third_party_integration_tests/ci/test.sh
@@ -11,7 +11,7 @@ set -euo pipefail
 
 rapids-logger "Generate Python testing dependencies"
 rapids-dependency-file-generator \
-  --config "python/cudf/cudf_pandas_tests/third_party_integration_tests/dependencies.yaml" \
+  --config "python/cudf/cudf_pandas_third_party_integration_tests/dependencies.yaml" \
   --output conda \
   --file-key test_${LIB} \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
@@ -28,7 +28,7 @@ echo "The working directory is ${PWD}"
 mkdir -p "${RAPIDS_TESTS_DIR}"
 
 repo_root=$(git rev-parse --show-toplevel)
-TEST_DIR=${repo_root}/python/cudf/cudf_pandas_tests/third_party_integration_tests/tests
+TEST_DIR=${repo_root}/python/cudf/cudf_pandas_third_party_integration_tests/tests
 
 rapids-print-env
 
@@ -51,7 +51,7 @@ for serial_library in "${serial_libraries[@]}"; do
     fi
 done
 
-RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR} TEST_DIR=${TEST_DIR} NUM_PROCESSES=${NUM_PROCESSES} python/cudf/cudf_pandas_tests/third_party_integration_tests/ci/ci_run_library_tests.sh ${LIB}
+RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR} TEST_DIR=${TEST_DIR} NUM_PROCESSES=${NUM_PROCESSES} python/cudf/cudf_pandas_third_party_integration_tests/ci/ci_run_library_tests.sh ${LIB}
 
 rapids-logger "Test script exiting with value: ${EXITCODE}"
 exit ${EXITCODE}
diff --git a/...party_integration_tests/dependencies.yaml → ...party_integration_tests/dependencies.yaml b/...party_integration_tests/dependencies.yaml → ...party_integration_tests/dependencies.yaml
diff --git a/...party_integration_tests/tests/conftest.py → ...party_integration_tests/tests/conftest.py b/...party_integration_tests/tests/conftest.py → ...party_integration_tests/tests/conftest.py
diff --git a/..._party_integration_tests/tests/pytest.ini → ..._party_integration_tests/tests/pytest.ini b/..._party_integration_tests/tests/pytest.ini → ..._party_integration_tests/tests/pytest.ini
diff --git a/...y_integration_tests/tests/test_cugraph.py → ...y_integration_tests/tests/test_cugraph.py b/...y_integration_tests/tests/test_cugraph.py → ...y_integration_tests/tests/test_cugraph.py
diff --git a/...arty_integration_tests/tests/test_cuml.py → ...arty_integration_tests/tests/test_cuml.py b/...arty_integration_tests/tests/test_cuml.py → ...arty_integration_tests/tests/test_cuml.py
diff --git a/...arty_integration_tests/tests/test_dask.py → ...arty_integration_tests/tests/test_dask.py b/...arty_integration_tests/tests/test_dask.py → ...arty_integration_tests/tests/test_dask.py
diff --git a/...gration_tests/tests/test_featureengine.py → ...gration_tests/tests/test_featureengine.py b/...gration_tests/tests/test_featureengine.py → ...gration_tests/tests/test_featureengine.py
diff --git a/...integration_tests/tests/test_holoviews.py → ...integration_tests/tests/test_holoviews.py b/...integration_tests/tests/test_holoviews.py → ...integration_tests/tests/test_holoviews.py
diff --git a/...ty_integration_tests/tests/test_hvplot.py → ...ty_integration_tests/tests/test_hvplot.py b/...ty_integration_tests/tests/test_hvplot.py → ...ty_integration_tests/tests/test_hvplot.py
diff --git a/...arty_integration_tests/tests/test_ibis.py → ...arty_integration_tests/tests/test_ibis.py b/...arty_integration_tests/tests/test_ibis.py → ...arty_integration_tests/tests/test_ibis.py
diff --git a/...ntegration_tests/tests/test_matplotlib.py → ...ntegration_tests/tests/test_matplotlib.py b/...ntegration_tests/tests/test_matplotlib.py → ...ntegration_tests/tests/test_matplotlib.py
diff --git a/...rty_integration_tests/tests/test_numpy.py → ...rty_integration_tests/tests/test_numpy.py b/...rty_integration_tests/tests/test_numpy.py → ...rty_integration_tests/tests/test_numpy.py
diff --git a/...ty_integration_tests/tests/test_plotly.py → ...ty_integration_tests/tests/test_plotly.py b/...ty_integration_tests/tests/test_plotly.py → ...ty_integration_tests/tests/test_plotly.py
diff --git a/...y_integration_tests/tests/test_pytorch.py → ...y_integration_tests/tests/test_pytorch.py b/...y_integration_tests/tests/test_pytorch.py → ...y_integration_tests/tests/test_pytorch.py
@@ -121,6 +121,8 @@ def test_torch_tensor_ctor():
     return torch.tensor(s.values)
 
 
+@pytest.mark.xfail_cudf_pandas(reason="Known failure, see xdf/#210")
+@pytest.mark.xfail_compare
 def test_torch_tensor_from_numpy():
     s = pd.Series(range(5))
     return torch.from_numpy(s.values)
diff --git a/...rty_integration_tests/tests/test_scipy.py → ...rty_integration_tests/tests/test_scipy.py b/...rty_integration_tests/tests/test_scipy.py → ...rty_integration_tests/tests/test_scipy.py
diff --git a/...y_integration_tests/tests/test_seaborn.py → ...y_integration_tests/tests/test_seaborn.py b/...y_integration_tests/tests/test_seaborn.py → ...y_integration_tests/tests/test_seaborn.py
diff --git a/...y_integration_tests/tests/test_sklearn.py → ...y_integration_tests/tests/test_sklearn.py b/...y_integration_tests/tests/test_sklearn.py → ...y_integration_tests/tests/test_sklearn.py
diff --git a/...ty_integration_tests/tests/test_stumpy.py → ...ty_integration_tests/tests/test_stumpy.py b/...ty_integration_tests/tests/test_stumpy.py → ...ty_integration_tests/tests/test_stumpy.py
diff --git a/...on_tests/tests/test_stumpy_distributed.py → ...on_tests/tests/test_stumpy_distributed.py b/...on_tests/tests/test_stumpy_distributed.py → ...on_tests/tests/test_stumpy_distributed.py
diff --git a/...ntegration_tests/tests/test_tensorflow.py → ...ntegration_tests/tests/test_tensorflow.py b/...ntegration_tests/tests/test_tensorflow.py → ...ntegration_tests/tests/test_tensorflow.py
diff --git a/...y_integration_tests/tests/test_xgboost.py → ...y_integration_tests/tests/test_xgboost.py b/...y_integration_tests/tests/test_xgboost.py → ...y_integration_tests/tests/test_xgboost.py