tweak for 32/64 bit wheels, fixes for windows

Author: mattip

.github/workflows/posix.yml

@@ -21,7 +21,7 @@ jobs:
         os: [ubuntu-latest, macos-11]
         PLAT: [i686, x86_64]
         INTERFACE64: ['0', '1']
-        MB_ML_VER: [2014]
+        MB_ML_VER: ['2014']
         include:
           - os: macos-11
             PLAT: arm64
@@ -40,8 +40,8 @@ jobs:
             MB_ML_LIBC: musllinux
             MB_ML_VER: _1_1
         exclude:
-          - os: macos-11
-            MB_ML_VER: 2014
+          - PLAT: i686
+            os: macos-11
           - PLAT: i686
             INTERFACE64: '1'
     env:

.github/workflows/windows.yml

@@ -10,6 +10,7 @@ env:
   OPENBLAS_COMMIT: "c2f4bdb"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
+  # Without this, invoking bash will cd to the home directory
   CHERE_INVOKING: "yes"
   BASH_PATH: "c:\\rtools40\\usr\\bin\\bash.exe"
 
@@ -38,7 +39,7 @@ jobs:
         echo "START_DIR=$PWD" >> $env:GITHUB_ENV
         # For interpretation of MSYSTEM, see:
         # https://sourceforge.net/p/msys2/discussion/general/thread/b7dfdac8/#3939
-        if ( ${{ matrix.plat }} -eq x86) {
+        if ( "${{ matrix.plat }}" -eq "x86") {
           echo "PLAT=i686" >> $env:GITHUB_ENV
           echo "MSYSTEM=MINGW32" >> $env:GITHUB_ENV
           echo "LDFLAGS=-static -static-libgcc" >> $env:GITHUB_ENV
@@ -79,12 +80,41 @@ jobs:
 
     - name: Build wheel
       run: |
-        & $env:BASH_PATH -lc tools/build_wheel_winbash.sh
+        python -m pip install wheel
+        # This will fail if there is more than one file in libs
+        unzip -d local/openblas builds/openblas*.zip
+        if [[ -d local\openblas\64 ]]; then
+            mv local/openblas/64/* local/openblas
+            rm -rf local/openblas/64
+        ) ELSE (
+            mv local/openblas/32/* local/openblas
+            rm -rf local/openblas/32
+        )
+        mv local/openblas/bin/*.dll local/openblas/lib
+        rm local/openblas/lib/*.a
+        rm local/openblas/lib/*.exp
+        rm local/openblas/lib/*.def
+        python -m pip wheel -w dist -vv .
+
+    - name: Set up different Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.11
+        architecture: ${{ matrix.plat }}
+
+    - name: Test wheel
+      run: |
+        python -m pip install --no-index --find-links dist openblas
+        python -m openblas
 
     - uses: actions/upload-artifact@v3
       with:
         path: builds/openblas*.zip
 
+    - uses: actions/upload-artifact@v3
+      with:
+        path: dist/openblas*.whl
+
     - uses: conda-incubator/setup-miniconda@v2
       with:
         activate-environment: upload

setup.py

@@ -12,13 +12,18 @@ def get_tag(self):
         python, abi, plat = bdist_wheel.get_tag(self)
         return python, "abi3", plat
 
+library_dir=os.path.join(mydir, 'local', 'openblas', 'lib')
+inc_dir=os.path.join(mydir, 'local', 'openblas', 'include')
 
-# TODO: determine if we are building 64- or 32- bit interfaces
-use_64=True
-if use_64:
-    macros = [("SUFFIX", "64_")]
+if sys.platform == "win32":
+    # Get libopenblas*.lib
+    libnames = [x for x in os.listdir(library_dir) if x.endswith(".lib")]
 else:
-    macros = []
+    # Get openblas*
+    libnames = [os.path.splitext(x)[0][3:] 
+        for x in os.listdir(library_dir) if x.startswith("libopenblas")]
+
+macros = []
 
 if sys.implementation.name == "cpython":
     cmdclass = {"bdist_wheel": bdist_wheel_abi3}
@@ -28,16 +33,12 @@ def get_tag(self):
     cmdclass = {}
     py_limited_api = {}
 
-library_dir=os.path.join(mydir, 'local', 'openblas', 'lib')
-if sys.platform == "win32":
-    libnames = [x for x in os.listdir(library_dir) if x.endswith(".lib")]
-else:
-    libnames = [x for x in os.listdir(library_dir) if x.startswith("libopenblas")]
 setup(
     cmdclass=cmdclass,
     ext_modules=[Extension(
         "openblas._init_openblas", ["src/_init_openblas.c"],
-        libraries=["openblas_python"],
+        include_dirs=[inc_dir],
+        libraries=libnames,
         library_dirs=[library_dir],
         extra_link_args=["-Wl,-rpath,$ORIGIN/lib"],
         define_macros=macros,

src/_init_openblas.c

@@ -1,11 +1,10 @@
 #include <Python.h>
+#include <openblas_config.h>
 
-#ifdef SUFFIX
+#ifdef OPENBLAS_USE64BITINT
   #define openblas_get_config openblas_get_config64_
 #endif
 
-extern const char * openblas_get_config();
-
 PyObject *
 get_config(PyObject *self, PyObject *args) {
     const char * config = openblas_get_config();

tools/build_wheel_winbash.sh

@@ -6,19 +6,32 @@ if [ "$?" != "0" ]; then
 fi
 
 mkdir -p local/openblas
+mkdir -p dist
+python3.7 -m pip install wheel auditwheel
+
 # This will fail if there is more than one file in libs
 tar -C local/openblas --strip-components=2 -xf libs/openblas*.tar.gz
 
 # do not package the static libs and symlinks, only take the shared object
 find local/openblas/lib -maxdepth 1 -type l -delete
 rm local/openblas/lib/*.a
-
 mv local/openblas/lib/libopenblas* local/openblas/lib/libopenblas_python.so
-patchelf --set-soname libopenblas_python.so local/openblas/lib/libopenblas_python.so
-python3.7 -m pip install wheel auditwheel
-python3.7 -m pip wheel -w /tmp/wheelhouse -vv .
-auditwheel repair -w dist/ /tmp/wheelhouse/openblas-*.whl
+
+if [ $(uname) != "Darwin" ]; then
+    patchelf --set-soname libopenblas_python.so local/openblas/lib/libopenblas_python.so
+fi
+
+python3.7 -m pip wheel -w dist -vv .
+if [ $(uname) == "Darwin" ]; then
+    python3.7 -m pip install delocate
+    delocate-wheel dist/*.whl
+else
+    auditwheel repair dist/*.whl
+fi
 
 # Test that the wheel works with a different python
 python3.11 -m pip install --no-index --find-links dist openblas
+if [ $(uname) == "Darwin" ]; then
+    otool -L /Library/Frameworks/Python.framework/Versions/3.11/lib/python3.11/site-packages/openblas/_init_openblas.abi3.so
+fi
 python3.11 -m openblas