Merge pull request #168 from mattip/numpy-nan-fix

update to v0.3.27-341-g09298658 for NAN fix

Author: mattip

.github/workflows/posix.yml

@@ -9,6 +9,11 @@ on:
   schedule:
     - cron: '0 0 * * 0'
 
+env:
+  REPO_DIR: OpenBLAS
+  OPENBLAS_COMMIT: "0929865"
+  MACOSX_DEPLOYMENT_TARGET: 10.9
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -46,10 +51,7 @@ jobs:
           - PLAT: i686
             INTERFACE64: '1'
     env:
-      REPO_DIR: OpenBLAS
-      OPENBLAS_COMMIT: "35d84ad012"
       NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-      MACOSX_DEPLOYMENT_TARGET: 10.9
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
       MB_ML_LIBC: ${{ matrix.MB_ML_LIBC }}

.github/workflows/windows.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch: null
 
 env:
-  OPENBLAS_COMMIT: "35d84ad012"
+  OPENBLAS_COMMIT: "0929865"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   # Without this, invoking bash will cd to the home directory

.travis.yml

@@ -2,12 +2,11 @@ env:
     global:
         # The archive that gets built has name from ``git describe`` on this
         # commit.
-        - OPENBLAS_COMMIT: "35d84ad012"
+        - OPENBLAS_COMMIT: "0929865"
         - REPO_DIR=OpenBLAS
 
-language: python
 sudo: required
-dist: bionic
+dist: jammy
 services: docker
 
 matrix:
@@ -17,6 +16,7 @@ matrix:
       env:
         - PLAT=aarch64
         - MB_ML_VER=_1_1
+        - INTERFACE64=0
         - MB_ML_LIBC=musllinux
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
     - os: linux
@@ -32,6 +32,7 @@ matrix:
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
+        - INTERFACE64=0
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
     - os: linux
       arch: arm64
@@ -45,6 +46,7 @@ matrix:
       env:
         - PLAT=s390x
         - MB_ML_VER=2014
+        - INTERFACE64=0
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
     - os: linux
       arch: s390x
@@ -58,6 +60,7 @@ matrix:
       env:
         - PLAT=ppc64le
         - MB_ML_VER=2014
+        - INTERFACE64=0
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
     - os: linux
       arch: ppc64le
@@ -84,18 +87,15 @@ script:
     # Build library and collect into libs subdirectory
     - |
       if [ ${TRAVIS_EVENT_TYPE} == "cron" ]; then
-        build_lib "$PLAT" "$INTERFACE64" 1
+        travis wait build_lib "$PLAT" "$INTERFACE64" 1
         version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
         sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
       else
-        build_lib "$PLAT" "$INTERFACE64" 0
+        travis wait build_lib "$PLAT" "$INTERFACE64" 0
       fi
     - libc=${MB_ML_LIBC:-manylinux}
     - docker_image=quay.io/pypa/${libc}${MB_ML_VER}_${PLAT}
-    - docker run --rm -e INTERFACE64="${INTERFACE64}" \
-        -e MB_ML_LIBC="${MB_ML_LIBC}" \
-        -v $(pwd):/openblas $docker_image \
-        /bin/bash -xe /openblas/tools/build_wheel.sh
+    - docker run --rm -e INTERFACE64="${INTERFACE64}" -e MB_ML_LIBC="${MB_ML_LIBC}" -v $(pwd):/openblas "${docker_image}" /bin/bash -xe /openblas/tools/build_wheel.sh
 
 after_success:
     - set +ex

OpenBLAS

@@ -8,7 +8,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scipy-openblas64"
-version = "0.3.27.63.1"
+# v0.3.27-341-g09298658
+version = "0.3.27.341.0"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

pyproject.toml

@@ -63,6 +63,7 @@ function build_lib {
     #     BUILD_PREFIX - install suffix e.g. "/usr/local"
     #     GFORTRAN_DMG
     #     MB_ML_VER
+    echo running build_lib
     set -x
     local plat=${1:-$PLAT}
     local interface64=${2:-$INTERFACE64}
@@ -71,13 +72,16 @@ function build_lib {
     # Make directory to store built archive
     if [ -n "$IS_OSX" ]; then
         # Do build, add gfortran hash to end of name
+        echo building on macox since IS_OSX is defined
         wrap_wheel_builder do_build_lib "$plat" "gf_${GFORTRAN_SHA:0:7}" "$interface64" "$nightly"
         return
     fi
     # Manylinux wrapper
     local libc=${MB_ML_LIBC:-manylinux}
     local docker_image=quay.io/pypa/${libc}${manylinux}_${plat}
+    echo pulling image ${docker_image}
     docker pull $docker_image
+    echo done pulling image, starting docker run
     # Docker sources this script, and runs `do_build_lib`
     docker run --rm \
         -e BUILD_PREFIX="$BUILD_PREFIX" \
@@ -89,6 +93,7 @@ function build_lib {
         -e MB_ML_LIBC=${libc} \
         -v $PWD:/io \
         $docker_image /io/tools/docker_build_wrap.sh
+    echo done docker run of docker_build_wrap.sh
 }
 
 function patch_source {
@@ -172,7 +177,10 @@ function do_build_lib {
     CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
     make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
         USE_OPENMP=0 NUM_THREADS=64 \
-        BINARY=$bitness $interface_flags $target_flags > /dev/null
+        BINARY=$bitness $interface_flags $target_flags shared > /dev/null
+    make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
+        USE_OPENMP=0 NUM_THREADS=64 \
+        BINARY=$bitness $interface_flags $target_flags tests
     make PREFIX=$BUILD_PREFIX $interface_flags install
     popd
     stop_spinner