clean up cruft from old openblas handling

Author: mattip

config.sh

@@ -8,10 +8,9 @@ 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
+    echo gcc --version
+    echo `gcc --version`
     build_libs $lib_plat
     # Fix version error for development wheels by using bdist_wheel
     build_bdist_wheel $@
@@ -44,7 +43,13 @@ function run_tests {
     $PYTHON_EXE -c "$(get_test_cmd)"
     # Check bundled license file
     $PYTHON_EXE ../check_license.py
-    # Show BLAS / LAPACK used. Since this uses a wheel we cannot use
-    # tools/openblas_config.py; tools is not part of what is shipped
+    # Show BLAS / LAPACK used. Assumes this is one-directory-in
+    # so we can find tools/openblas_config.py;
+    if [ -e ../numpy/tools/openblas_support.py ]; then
+        $PYTHON_EXE ../numpy/tools/openblas_support.py --check_version
+    else
+        echo could not find ../numpy, ls -d .. is
+        ls -d ..
+    fi
     $PYTHON_EXE -c 'import numpy; numpy.show_config()'
 }

env_vars.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # Environment variables for build
-OPENBLAS_VERSION="v0.3.7"
 MACOSX_DEPLOYMENT_TARGET=10.9
 CFLAGS="-std=c99 -fno-strict-aliasing"
 # Macos's linker doesn't support stripping symbols
@@ -13,3 +12,6 @@ if [ "$(uname)" != "Darwin" ]; then
     # the current version of manybuild pass "-strip-all" to CPPFLAGS and FFLAGS
     STRIP_FLAGS=""
 fi
+# For verbosity: report where each command came from
+export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+set -x

env_vars_32.sh

@@ -3,11 +3,8 @@
 # The important difference from the 64-bit build is `-msse2` to
 # compile sse loops for ufuncs.
 set -x
-OPENBLAS_VERSION="v0.3.7"
 MACOSX_DEPLOYMENT_TARGET=10.9
-# Causes failure for pre-1.19 in np.reciprocal
-# CFLAGS="-msse2 -std=c99 -fno-strict-aliasing"
-CFLAGS="-std=c99 -fno-strict-aliasing"
+CFLAGS="-msse2 -std=c99 -fno-strict-aliasing"
 # Macos's linker doesn't support stripping symbols
 if [ "$(uname)" != "Darwin" ]; then
     LDFLAGS="-Wl,--strip-debug"