diff options
| author | Matti Picus <matti.picus@gmail.com> | 2022-11-17 18:17:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-17 09:17:24 -0700 |
| commit | 9e144f7c1598221510d49d8c6b79c66dc000edf6 (patch) | |
| tree | 328b44ee403c23745c50dd0ad27ae01d86e8c040 /numpy | |
| parent | 4a89f39a199f86a5d88c09f447e4dcf2eb40cc1e (diff) | |
| download | numpy-9e144f7c1598221510d49d8c6b79c66dc000edf6.tar.gz | |
BLD: update OpenBLAS to 0.3.21 and clean up openblas download test (#22525)
* BUILD: update OpenBLAS to 0.3.21 and clean up openblas download test
* set LDFLAGS on windows64 like the openblaslib build does
* use rtools compilers on windows when building wheels
* fix typos
* add rtools gfortran to PATH
* use the openblas dll from the zip archive without rewrapping
* typos
* copy dll import library for 64-bit interfaces
* revert many of the changes to azure-steps-windows.yaml, copy openblas better in wheels
* fix wildcard copy
* test OpenBLAS build worked with threadpoolctl
* typos
* install threadpoolctl where needed, use for loop to recursively copy
* update macos OpenBLAS suffixes for newer gfortran hashes
* use libgfortran5.dylib on macos
* fix scripts
* re-use gfortran install from MacPython/gfortran-install on macos
* use pre-release version of delocate
* fixes for wheel builds/tests
* add debugging cruft for pypy+win, macos wheels
* add DYLD_LIBRARY_PATH on macosx-x86_64
* use 32-bit openblas interfaces for ppc64le tests
* skip large_archive test that sometimes segfaults on PyPy+windows
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 7 | ||||
| -rw-r--r-- | numpy/lib/tests/test_format.py | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 8b568c159..6dc6b4265 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -586,6 +586,13 @@ class build_ext (old_build_ext): # not using fcompiler linker self._libs_with_msvc_and_fortran( fcompiler, libraries, library_dirs) + if ext.runtime_library_dirs: + # gcc adds RPATH to the link. On windows, copy the dll into + # self.extra_dll_dir instead. + for d in ext.runtime_library_dirs: + for f in glob(d + '/*.dll'): + copy_file(f, self.extra_dll_dir) + ext.runtime_library_dirs = [] elif ext.language in ['f77', 'f90'] and fcompiler is not None: linker = fcompiler.link_shared_object diff --git a/numpy/lib/tests/test_format.py b/numpy/lib/tests/test_format.py index ab9472020..6f6406cf8 100644 --- a/numpy/lib/tests/test_format.py +++ b/numpy/lib/tests/test_format.py @@ -923,6 +923,7 @@ def test_large_file_support(tmpdir): assert_array_equal(r, d) +@pytest.mark.skipif(IS_PYPY, reason="flaky on PyPy") @pytest.mark.skipif(np.dtype(np.intp).itemsize < 8, reason="test requires 64-bit system") @pytest.mark.slow |