From 870936df435ac99913e3afab2664642884a629a1 Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 3 Jun 2024 17:27:23 +0800 Subject: [PATCH 1/2] TST: Re-enable int8/uint8 einsum tests It seems #24732 fixed itself, see the following CI runs: - github.com/JuliaPoo/numpy/actions/runs/9344912430/job/25716839862 - github.com/JuliaPoo/numpy/actions/runs/9344767573/job/25716459859 --- numpy/_core/tests/test_einsum.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/numpy/_core/tests/test_einsum.py b/numpy/_core/tests/test_einsum.py index 55f2546185e7..bc5927122786 100644 --- a/numpy/_core/tests/test_einsum.py +++ b/numpy/_core/tests/test_einsum.py @@ -621,23 +621,9 @@ def check_einsum_sums(self, dtype, do_opt=False): [2.]) # contig_stride0_outstride0_two def test_einsum_sums_int8(self): - if ( - (sys.platform == 'darwin' and platform.machine() == 'x86_64') - or - USING_CLANG_CL - ): - pytest.xfail('Fails on macOS x86-64 and when using clang-cl ' - 'with Meson, see gh-23838') self.check_einsum_sums('i1') def test_einsum_sums_uint8(self): - if ( - (sys.platform == 'darwin' and platform.machine() == 'x86_64') - or - USING_CLANG_CL - ): - pytest.xfail('Fails on macOS x86-64 and when using clang-cl ' - 'with Meson, see gh-23838') self.check_einsum_sums('u1') def test_einsum_sums_int16(self): From 731fd5f7332b71d7c40615cf03e92a729e771f29 Mon Sep 17 00:00:00 2001 From: Jules Date: Wed, 5 Jun 2024 15:51:13 +0800 Subject: [PATCH 2/2] [wheel build] Clean-up USING_CLANG_CL from test file --- numpy/_core/tests/test_einsum.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/numpy/_core/tests/test_einsum.py b/numpy/_core/tests/test_einsum.py index bc5927122786..0a97693f73b0 100644 --- a/numpy/_core/tests/test_einsum.py +++ b/numpy/_core/tests/test_einsum.py @@ -10,12 +10,6 @@ assert_raises, suppress_warnings, assert_raises_regex, assert_allclose ) -try: - COMPILERS = np.show_config(mode="dicts")["Compilers"] - USING_CLANG_CL = COMPILERS["c"]["name"] == "clang-cl" -except TypeError: - USING_CLANG_CL = False - # Setup for optimize einsum chars = 'abcdefghij' sizes = np.array([2, 3, 4, 5, 4, 3, 2, 6, 5, 4, 3])