Fixes for latest commit of scipy and add universal2 wheels (#125)

* Enable universal2 wheels

Changes ported from `numpy-wheels`  found at:
- MacPython/numpy-wheels#104
- MacPython/numpy-wheels#115

* Add missing call to `wrap_wheel_builder`

* Add `install_delocate`

Ported from:
- MacPython/numpy-wheels#109
- MacPython/numpy-wheels#110

* Trigger rebuild now that the needed SciPy PR is merged

* use mingw-w64 gcc=7

* update multibuild

* cleanup config.sh

* Set F77 and F90 too

* Set MB_ML_VER

* run build_libs for osx

* gcc 7 for i686

* set _ISOC99_SOURCE

* cleanup

* Need fPIC for Linux

* fPIC for all platforms

* keep using MB_ML_VER=1 until we drop manylinux1

Co-authored-by: Judah Rand <[email protected]>
Co-authored-by: Ralf Gommers <[email protected]>

Author: 3 people

.travis.yml

@@ -44,6 +44,7 @@ jobs:
         - PLAT=aarch64
         - CYTHON_BUILD_DEP="Cython"
         - DOCKER_IMAGE=quay.io/pypa/manylinux2014_${PLAT}
+        - MB_ML_VER=2014
       script:
         - echo "This stage will just build AArch64 wheel"
       workspaces:
@@ -64,6 +65,7 @@ jobs:
         - PLAT=aarch64
         - CYTHON_BUILD_DEP="Cython"
         - DOCKER_IMAGE=quay.io/pypa/manylinux2014_${PLAT}
+        - MB_ML_VER=2014
       script:
         - echo "This stage will just build AArch64 wheel"
       workspaces:
@@ -84,6 +86,7 @@ jobs:
         - PLAT=aarch64
         - CYTHON_BUILD_DEP="Cython"
         - DOCKER_IMAGE=quay.io/pypa/manylinux2014_${PLAT}
+        - MB_ML_VER=2014
       script:
         - echo "This stage will just build AArch64 wheel"
       workspaces:
@@ -105,6 +108,7 @@ jobs:
         - PLAT=aarch64
         - CYTHON_BUILD_DEP="Cython"
         - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
+        - MB_ML_VER=2014
       workspaces:
         use: ws1
       install:
@@ -119,6 +123,7 @@ jobs:
         - PLAT=aarch64
         - CYTHON_BUILD_DEP="Cython"
         - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
+        - MB_ML_VER=2014
       workspaces:
         use: ws4
       install:
@@ -133,6 +138,7 @@ jobs:
         - PLAT=aarch64
         - CYTHON_BUILD_DEP="Cython"
         - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
+        - MB_ML_VER=2014
       workspaces:
         use: ws3
       install:

appveyor.yml

@@ -10,8 +10,8 @@ cache:
 
 environment:
   global:
-      MINGW_32: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin
-      MINGW_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
+      MINGW_32: C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw32\bin
+      MINGW_64: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
       CYTHON_BUILD_DEP: Cython==0.29.18
       PYTHRAN_BUILD_DEP: pythran
       NUMPY_TEST_DEP: numpy==1.16.5
@@ -89,6 +89,9 @@ install:
   - echo "Installed SDKs:"
   - dir "C:/Program Files/Microsoft SDKs/Windows"
 
+  # install a newer mingw for i686 as the appveyor images don't have gcc 7+ for i686
+  - if [%PYTHON_ARCH%]==[32] choco install -y mingw --forcex86 --force --version=7.3.0
+
   - git submodule update --init
 
   # Install new Python if necessary

azure-pipelines.yml

@@ -38,13 +38,21 @@ jobs:
   - template: azure-posix.yml
     parameters:
       name: macOS
-      vmImage: macOS-10.14
+      vmImage: macOS-10.15
       matrix:
         osx-Py37:
           MB_PYTHON_VERSION: "3.7"
         osx-Py38:
           MB_PYTHON_VERSION: "3.8"
           MB_PYTHON_OSX_VER: "10.9"
+        osx-Py38-universal2:
+          MB_PYTHON_VERSION: "3.8"
+          MB_PYTHON_OSX_VER: "10.9"
+          PLAT: universal2
         osx-Py39:
           MB_PYTHON_VERSION: "3.9"
           MB_PYTHON_OSX_VER: "10.9"
+        osx-Py39-universal2:
+          MB_PYTHON_VERSION: "3.9"
+          MB_PYTHON_OSX_VER: "10.9"
+          PLAT: universal2

azure-posix.yml

@@ -12,6 +12,7 @@ jobs:
       PLAT: "x86_64"
       NIGHTLY_BUILD_COMMIT: "master"
       DAILY_COMMIT: "master"
+      MB_ML_VER: "1"
     strategy:
       matrix:
         ${{ insert }}: ${{ parameters.matrix }}
@@ -56,8 +57,9 @@ jobs:
         displayName: Define build env variables
 
       - bash: |
-          set -e
+          set -ex
           echo building for commit "$BUILD_COMMIT"
+
           pip install --upgrade virtualenv wheel setuptools
           BUILD_DEPENDS="wheel oldest-supported-numpy Cython>=0.29.18 pybind11>=2.4.3 pythran"
 

config.sh

@@ -4,34 +4,24 @@
 source gfortran-install/gfortran_utils.sh
 
 function build_wheel {
+    export FFLAGS="$FFLAGS -fPIC"
     if [ -z "$IS_OSX" ]; then
-        unset FFLAGS
-        export LDFLAGS="-shared -Wl,-strip-all"
         build_libs $PLAT
         # Work round build dependencies spec in pyproject.toml
         build_bdist_wheel $@
     else
-        export FFLAGS="$FFLAGS -fPIC"
-        build_osx_wheel $@
+        install_gfortran
+        wrap_wheel_builder build_osx_wheel $@
     fi
 }
 
 function build_libs {
     PYTHON_EXE=`which python`
     $PYTHON_EXE -c"import platform; print('platform.uname().machine', platform.uname().machine)"
     basedir=$($PYTHON_EXE scipy/tools/openblas_support.py)
-    $use_sudo cp -r $basedir/lib/* /usr/local/lib
-    $use_sudo cp $basedir/include/* /usr/local/include
-}
-
-function set_arch {
-    local arch=$1
-    export CC="clang $arch"
-    export CXX="clang++ $arch"
-    export CFLAGS="$arch"
-    export FFLAGS="$arch"
-    export FARCH="$arch"
-    export LDFLAGS="$arch"
+    $use_sudo cp -r $basedir/lib/* $BUILD_PREFIX/lib
+    $use_sudo cp $basedir/include/* $BUILD_PREFIX/include
+    export OPENBLAS=$BUILD_PREFIX
 }
 
 function build_wheel_with_patch {
@@ -41,19 +31,12 @@ function build_wheel_with_patch {
 }
 
 function build_osx_wheel {
-    # Build 64-bit wheel
-    # Standard gfortran won't build dual arch objects.
     local repo_dir=${1:-$REPO_DIR}
-    local py_ld_flags="-Wall -undefined dynamic_lookup -bundle"
-
-    install_gfortran
-    # 64-bit wheel
-    local arch="-m64"
-    set_arch $arch
-    build_libs x86_64
-    # Build wheel
-    export LDSHARED="$CC $py_ld_flags"
-    export LDFLAGS="$arch $py_ld_flags"
+    if [ ! -z "$FC" ]; then
+       export F77=$FC
+       export F90=$FC
+    fi
+    build_libs
     # Work round build dependencies spec in pyproject.toml
     # See e.g.
     # https://travis-ci.org/matthew-brett/scipy-wheels/jobs/387794282