Skip to content

Commit c97ff8c

Browse files
committed
Updated names of skipped tests based on new f/w rules
1 parent c0f0bce commit c97ff8c

File tree

3 files changed

+41
-35
lines changed

3 files changed

+41
-35
lines changed

tests/skipped_tests.tbl

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -705,22 +705,25 @@ tests/third_party/cupy/random_tests/test_sample.py::TestRandomIntegers2::test_bo
705705
tests/third_party/cupy/random_tests/test_sample.py::TestRandomIntegers2::test_goodness_of_fit
706706
tests/third_party/cupy/random_tests/test_sample.py::TestRandomIntegers2::test_goodness_of_fit_2
707707

708-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_0_{func='argmin', is_module=True, shape=(3, 4)}::test_argminmax_dtype
709-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_1_{func='argmin', is_module=True, shape=()}::test_argminmax_dtype
710-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_2_{func='argmin', is_module=False, shape=(3, 4)}::test_argminmax_dtype
711-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_3_{func='argmin', is_module=False, shape=()}::test_argminmax_dtype
712-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_4_{func='argmax', is_module=True, shape=(3, 4)}::test_argminmax_dtype
713-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_5_{func='argmax', is_module=True, shape=()}::test_argminmax_dtype
714-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_6_{func='argmax', is_module=False, shape=(3, 4)}::test_argminmax_dtype
715-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_7_{func='argmax', is_module=False, shape=()}::test_argminmax_dtype
716-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere_param_0_{array=array([], dtype=float64)}::test_argwhere
717-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere_param_1_{array=array([], shape=(0, 2), dtype=float64)}::test_argwhere
718-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere_param_2_{array=array([], shape=(0, 2, 0), dtype=float64)}::test_argwhere
719-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_0_{array=array(0)}::test_flatnonzero
720-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_1_{array=array(1)}::test_flatnonzero
721-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_2_{array=array([], dtype=float64)}::test_flatnonzero
722-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_3_{array=array([], shape=(0, 2), dtype=float64)}::test_flatnonzero
723-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_4_{array=array([], shape=(0, 2, 0), dtype=float64)}::test_flatnonzero
708+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_0_{func='argmin', is_module=True, shape=(3, 4)}]
709+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_1_{func='argmin', is_module=True, shape=()}]
710+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_2_{func='argmin', is_module=False, shape=(3, 4)}]
711+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_3_{func='argmin', is_module=False, shape=()}]
712+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_4_{func='argmax', is_module=True, shape=(3, 4)}]
713+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_5_{func='argmax', is_module=True, shape=()}]
714+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_6_{func='argmax', is_module=False, shape=(3, 4)}]
715+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_7_{func='argmax', is_module=False, shape=()}]
716+
717+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere::test_argwhere[0]
718+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere::test_argwhere[1]
719+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere::test_argwhere[2]
720+
721+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[0]
722+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[1]
723+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[2]
724+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[3]
725+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[4]
726+
724727
tests/third_party/cupy/sorting_tests/test_search.py::TestNonzeroZeroDimension_param_0_{array=array(0)}::test_nonzero
725728
tests/third_party/cupy/sorting_tests/test_search.py::TestNonzeroZeroDimension_param_1_{array=array(1)}::test_nonzero
726729

tests/skipped_tests_gpu.tbl

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ tests/third_party/cupy/core_tests/test_ndarray_copy_and_view.py::TestArrayFlatte
191191
tests/third_party/cupy/core_tests/test_ndarray_copy_and_view.py::TestArrayFlatten::test_flatten_order_copied
192192
tests/third_party/cupy/core_tests/test_ndarray_copy_and_view.py::TestArrayFlatten::test_flatten_order_transposed
193193

194-
195-
196194
tests/third_party/cupy/core_tests/test_ndarray_reduction.py::TestCubReduction_param_0_{order='C', shape=(10,)}::test_cub_max
197195
tests/third_party/cupy/core_tests/test_ndarray_reduction.py::TestCubReduction_param_0_{order='C', shape=(10,)}::test_cub_min
198196
tests/third_party/cupy/core_tests/test_ndarray_reduction.py::TestCubReduction_param_1_{order='C', shape=(10, 20)}::test_cub_max
@@ -315,6 +313,7 @@ tests/third_party/cupy/indexing_tests/test_indexing.py::TestIndexing::test_diago
315313
tests/third_party/cupy/indexing_tests/test_indexing.py::TestIndexing::test_diagonal_negative3
316314
tests/third_party/cupy/indexing_tests/test_indexing.py::TestIndexing::test_diagonal_negative4
317315
tests/third_party/cupy/indexing_tests/test_indexing.py::TestIndexing::test_diagonal_negative5
316+
318317
tests/third_party/cupy/indexing_tests/test_insert.py::TestDiagIndicesFromRaises_param_4_{shape=(-1,)}::test_non_equal_dims
319318
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_0_{shape=(3, 3), val=1, wrap=True}::test_columnar_slice
320319
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_11_{shape=(2, 2, 2), val=0, wrap=False}::test_1darray
@@ -350,6 +349,7 @@ tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_7_{
350349
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_9_{shape=(2, 2, 2), val=1, wrap=False}::test_1darray
351350
tests/third_party/cupy/indexing_tests/test_insert.py::TestPutmaskDifferentDtypes::test_putmask_differnt_dtypes_raises
352351
tests/third_party/cupy/indexing_tests/test_insert.py::TestPutmask::test_putmask_non_equal_shape_raises
352+
353353
tests/third_party/cupy/indexing_tests/test_iterate.py::TestFlatiter::test_next
354354
tests/third_party/cupy/indexing_tests/test_iterate.py::TestFlatiter::test_iter
355355
tests/third_party/cupy/indexing_tests/test_iterate.py::TestFlatiterSubscript_param_1_{index=0, shape=(2, 3, 4)}::test_setitem_scalar
@@ -767,22 +767,25 @@ tests/third_party/cupy/random_tests/test_sample.py::TestRandomIntegers2::test_bo
767767
tests/third_party/cupy/random_tests/test_sample.py::TestRandomIntegers2::test_goodness_of_fit
768768
tests/third_party/cupy/random_tests/test_sample.py::TestRandomIntegers2::test_goodness_of_fit_2
769769

770-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_0_{func='argmin', is_module=True, shape=(3, 4)}::test_argminmax_dtype
771-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_1_{func='argmin', is_module=True, shape=()}::test_argminmax_dtype
772-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_2_{func='argmin', is_module=False, shape=(3, 4)}::test_argminmax_dtype
773-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_3_{func='argmin', is_module=False, shape=()}::test_argminmax_dtype
774-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_4_{func='argmax', is_module=True, shape=(3, 4)}::test_argminmax_dtype
775-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_5_{func='argmax', is_module=True, shape=()}::test_argminmax_dtype
776-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_6_{func='argmax', is_module=False, shape=(3, 4)}::test_argminmax_dtype
777-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype_param_7_{func='argmax', is_module=False, shape=()}::test_argminmax_dtype
778-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere_param_0_{array=array([], dtype=float64)}::test_argwhere
779-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere_param_1_{array=array([], shape=(0, 2), dtype=float64)}::test_argwhere
780-
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere_param_2_{array=array([], shape=(0, 2, 0), dtype=float64)}::test_argwhere
781-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_0_{array=array(0)}::test_flatnonzero
782-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_1_{array=array(1)}::test_flatnonzero
783-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_2_{array=array([], dtype=float64)}::test_flatnonzero
784-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_3_{array=array([], shape=(0, 2), dtype=float64)}::test_flatnonzero
785-
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero_param_4_{array=array([], shape=(0, 2, 0), dtype=float64)}::test_flatnonzero
770+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_0_{func='argmin', is_module=True, shape=(3, 4)}]
771+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_1_{func='argmin', is_module=True, shape=()}]
772+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_2_{func='argmin', is_module=False, shape=(3, 4)}]
773+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_3_{func='argmin', is_module=False, shape=()}]
774+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_4_{func='argmax', is_module=True, shape=(3, 4)}]
775+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_5_{func='argmax', is_module=True, shape=()}]
776+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_6_{func='argmax', is_module=False, shape=(3, 4)}]
777+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgMinMaxDtype::test_argminmax_dtype[_param_7_{func='argmax', is_module=False, shape=()}]
778+
779+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere::test_argwhere[0]
780+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere::test_argwhere[1]
781+
tests/third_party/cupy/sorting_tests/test_search.py::TestArgwhere::test_argwhere[2]
782+
783+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[0]
784+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[1]
785+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[2]
786+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[3]
787+
tests/third_party/cupy/sorting_tests/test_search.py::TestFlatNonzero::test_flatnonzero[4]
788+
786789
tests/third_party/cupy/sorting_tests/test_search.py::TestNonzeroZeroDimension_param_0_{array=array(0)}::test_nonzero
787790
tests/third_party/cupy/sorting_tests/test_search.py::TestNonzeroZeroDimension_param_1_{array=array(1)}::test_nonzero
788791

tests/test_linalg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ def test_eig_arange(type, size):
387387
@pytest.mark.parametrize("type", get_all_dtypes(no_bool=True, no_none=True))
388388
@pytest.mark.parametrize("size", [2, 4, 8])
389389
def test_eigh_arange(type, size):
390-
if dpctl.get_current_device_type() != dpctl.device_type.gpu:
390+
if dpctl.SyclDevice().device_type != dpctl.device_type.gpu:
391391
pytest.skip(
392392
"eig function doesn't work on CPU: https://github.com/IntelPython/dpnp/issues/1005"
393393
)

0 commit comments

Comments
 (0)