update submodules to latest versions and fixes for manylinux2010

Author: mattip

.travis.yml

@@ -19,11 +19,11 @@ env:
 language: python
 # Default Python version is usually 2.7
 python: 3.6
-sudo: required
 dist: bionic
 services: docker
+os: linux
 
-matrix:
+jobs:
   exclude:
       # Exclude the default Python 3.6 build
       - python: 3.6
@@ -37,6 +37,7 @@ matrix:
         - MB_PYTHON_VERSION=3.6
         - MB_ML_VER=2010
         - PLAT=i686
+        - ENV_VARS_PATH=env_vars_32.sh
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
@@ -46,6 +47,7 @@ matrix:
         - MB_PYTHON_VERSION=3.7
         - MB_ML_VER=2010
         - PLAT=i686
+        - ENV_VARS_PATH=env_vars_32.sh
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.8
@@ -55,6 +57,7 @@ matrix:
         - MB_PYTHON_VERSION=3.8
         - MB_ML_VER=2010
         - PLAT=i686
+        - ENV_VARS_PATH=env_vars_32.sh
     - os: osx
       language: generic
       osx_image: xcode10.1

config.sh

@@ -7,44 +7,38 @@ function build_wheel {
     local lib_plat=$PLAT
     if [ -n "$IS_OSX" ]; then
         install_gfortran
+    else
+        # For manylinux2010 builds with manylinux1 openblas builds
+        $use_sudo yum install -y libgfortran-4.4.7
     fi
     build_libs $lib_plat
     # Fix version error for development wheels by using bdist_wheel
     build_bdist_wheel $@
 }
 
 function build_libs {
-    local plat=${1:-$PLAT}
-    # Force 64-bit OpenBLAS library for macOS intel (dual arch)
-    # builds. For these builds, we pretend to be dual arch, but in
-    # fact we're only using the 64-bit build of OpenBLAS
-    if [ -n $IS_OSX ] && [ $plat == intel ]; then
-        plat=x86_64
-    fi
-    local tar_fname=$(get_gf_lib "openblas-${OPENBLAS_VERSION}" "$plat")
-    local tar_path=$(abspath $tar_fname)
-    # Sudo needed for macOS
-    local use_sudo=""
-    [ -n "$IS_OSX" ] && use_sudo="sudo"
-    (cd / && $use_sudo tar zxf $tar_path)
+    # Use the same incantation as numpy/tools/travis-before-install.sh
+    target=$(python numpy/tools/openblas_support.py)
+    $use_sudo cp -r $target/lib/* /usr/local/lib
+    $use_sudo cp $target/include/* /usr/local/include
 }
 
 function get_test_cmd {
     local extra_argv=${1:-$EXTRA_ARGV}
     echo "import sys; import numpy; \
         sys.exit(not numpy.test('full', \
-        extra_argv=[${extra_argv}]))"
+        extra_argv=['-vv', ${extra_argv}]))"
 }
 
 function run_tests {
     # Runs tests on installed distribution from an empty directory
-    # We only run the 64 bit tests as of NumPy 1.16.
     if [ -z "$IS_OSX" ]; then
         apt-get -y update && apt-get install -y gfortran
     fi
     python -c "$(get_test_cmd)"
     # Check bundled license file
     python ../check_license.py
-    # Show BLAS / LAPACK used
+    # Show BLAS / LAPACK used. Since this uses a wheel we cannot use
+    # tools/openblas_config.py; tools is not part of what is shipped
     python -c 'import numpy; numpy.show_config()'
 }

env_vars_32.sh

@@ -0,0 +1,4 @@
+# Environment variables for build
+OPENBLAS_VERSION="v0.3.7"
+MACOSX_DEPLOYMENT_TARGET=10.9
+CFLAGS="-msse2 -std=c99 -fno-strict-aliasing"