Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: align test_dispatcher s390x targets with _umath_tests_mtargets #24814

Merged
merged 2 commits into from Nov 7, 2023

Conversation

charris
Copy link
Member

@charris charris commented Sep 26, 2023

Backport of #24772.

This updates https://github.com/numpy/numpy/blob/main/numpy/core/tests/test_cpu_dispatcher.py#L12 targets matching what is set at https://github.com/numpy/numpy/blob/main/numpy/core/meson.build#L688 (i.e. adding VE and VXE).

This was discovered when testing an s390x build with optimization on.

@charris charris added 03 - Maintenance 08 - Backport Used to tag backport PRs component: SIMD Issues in SIMD (fast instruction sets) code or machinery labels Sep 26, 2023
@charris charris added this to the 1.26.1 release milestone Sep 26, 2023
@rgommers
Copy link
Member

The one test failure on TravisCI looks real, as noted on the original PR at #24772 (comment)

_______________________________ test_dispatcher ________________________________
...
>       assert_equal(test["func"], "func" + highest_sfx)
E       AssertionError: 
E       Items are not equal:
E        ACTUAL: 'func'
E        DESIRED: 'func_VXE'
all_sfx    = ['func_VXE', 'func_VX']
feature    = 'SSE2'
highest_sfx = '_VXE'
targets    = ('SSE2', 'SSE41', 'AVX2', 'VSX', 'VSX2', 'VSX3', ...)
test       = {'all': ['func'], 'func': 'func', 'func_xb': 'nobase', 'var': 'var', ...}
../../builds/venv/lib/python3.9/site-packages/numpy-1.26.0-py3.9-linux-s390x.egg/numpy/core/tests/test_cpu_dispatcher.py:32: AssertionError

@seiko2plus
Copy link
Member

The #24814 backport failed a test on the travis s390x. Might be a problem with the test

My bad, VX/VXE CPU features were not tested before and I have included the meson script without updating the distutils dispatch-able sources .

@charris charris merged commit ce1adca into numpy:maintenance/1.26.x Nov 7, 2023
48 checks passed
@charris
Copy link
Member Author

charris commented Nov 7, 2023

Thanks for the update Sayed.

@charris charris deleted the backport-24772 branch November 8, 2023 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
03 - Maintenance 08 - Backport Used to tag backport PRs component: SIMD Issues in SIMD (fast instruction sets) code or machinery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants