BLD: only use openblas_support.make_init() in CI, fix paths

mattip · mattip · commit 0b2f48a9b808 · 2023-09-21T10:33:24.000+03:00
diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml
@@ -49,11 +49,11 @@ steps:
   displayName: 'Build NumPy'
 
 - powershell: |
-    # copy from c:/opt/openblas/openblas_dll to numpy/.libs to ensure it can
+    # copy from c:/opt/openblas/openblas_dll to numpy/../numpy.libs to ensure it can
     # get loaded when numpy is imported (no RPATH on Windows)
     $target = $(python -c "import sysconfig; print(sysconfig.get_path('platlib'))")
-    mkdir $target/numpy/.libs
-    copy C:/opt/openblas/openblas_dll/*.dll $target/numpy/.libs
+    mkdir $target/numpy.libs
+    copy C:/opt/openblas/openblas_dll/*.dll $target/numpy.libs
   displayName: 'Copy OpenBLAS DLL to site-packages'
 
 - script: |
diff --git a/tools/openblas_support.py b/tools/openblas_support.py
@@ -238,6 +238,9 @@ def get_members():
 def make_init(dirname):
     '''
     Create a _distributor_init.py file for OpenBlas
+
+    Obsoleted by the use of delvewheel in wheel building, which
+    adds an equivalent snippet to numpy/__init__.py, but still useful in CI
     '''
     with open(os.path.join(dirname, '_distributor_init.py'), 'w') as fid:
         fid.write(textwrap.dedent("""
@@ -246,19 +249,19 @@ def make_init(dirname):
             Once a DLL is preloaded, its namespace is made available to any
             subsequent DLL. This file originated in the numpy-wheels repo,
             and is created as part of the scripts that build the wheel.
+
             '''
             import os
             import glob
             if os.name == 'nt':
-                # convention for storing / loading the DLL from
-                # numpy/.libs/, if present
+                # load any DLL from numpy/../numpy.libs/, if present
                 try:
                     from ctypes import WinDLL
-                    basedir = os.path.dirname(__file__)
                 except:
                     pass
                 else:
-                    libs_dir = os.path.abspath(os.path.join(basedir, '.libs'))
+                    basedir = os.path.dirname(__file__)
+                    libs_dir = os.path.abspath(os.path.join(basedir, os.pardir, 'numpy.libs'))
                     DLL_filenames = []
                     if os.path.isdir(libs_dir):
                         for filename in glob.glob(os.path.join(libs_dir,
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
@@ -36,7 +36,6 @@ elif [[ $RUNNER_OS == "Windows" ]]; then
     # this location you need to alter that script.
     mkdir -p /c/opt/openblas/openblas_dll
 
-    PYTHONPATH=tools python -c "import openblas_support; openblas_support.make_init('numpy')"
     mkdir -p /c/opt/32/lib/pkgconfig
     mkdir -p /c/opt/64/lib/pkgconfig
     target=$(python -c "import tools.openblas_support as obs; plat=obs.get_plat(); ilp64=obs.get_ilp64(); target=f'openblas_{plat}.zip'; obs.download_openblas(target, plat, ilp64);print(target)")
