Skip to content

Commit 20c179a

Browse files
authored
Merge pull request #168 from mattip/numpy-nan-fix
update to v0.3.27-341-g09298658 for NAN fix
2 parents ca41d89 + 9cb69b7 commit 20c179a

File tree

6 files changed

+27
-16
lines changed

6 files changed

+27
-16
lines changed

.github/workflows/posix.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ on:
99
schedule:
1010
- cron: '0 0 * * 0'
1111

12+
env:
13+
REPO_DIR: OpenBLAS
14+
OPENBLAS_COMMIT: "0929865"
15+
MACOSX_DEPLOYMENT_TARGET: 10.9
16+
1217
jobs:
1318
build:
1419
runs-on: ${{ matrix.os }}
@@ -46,10 +51,7 @@ jobs:
4651
- PLAT: i686
4752
INTERFACE64: '1'
4853
env:
49-
REPO_DIR: OpenBLAS
50-
OPENBLAS_COMMIT: "35d84ad012"
5154
NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
52-
MACOSX_DEPLOYMENT_TARGET: 10.9
5355
MB_PYTHON_VERSION: ${{ matrix.python-version }}
5456
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
5557
MB_ML_LIBC: ${{ matrix.MB_ML_LIBC }}

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch: null
99

1010
env:
11-
OPENBLAS_COMMIT: "35d84ad012"
11+
OPENBLAS_COMMIT: "0929865"
1212
OPENBLAS_ROOT: "c:\\opt"
1313
# Preserve working directory for calls into bash
1414
# Without this, invoking bash will cd to the home directory

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ env:
22
global:
33
# The archive that gets built has name from ``git describe`` on this
44
# commit.
5-
- OPENBLAS_COMMIT: "35d84ad012"
5+
- OPENBLAS_COMMIT: "0929865"
66
- REPO_DIR=OpenBLAS
77

8-
language: python
98
sudo: required
10-
dist: bionic
9+
dist: jammy
1110
services: docker
1211

1312
matrix:
@@ -17,6 +16,7 @@ matrix:
1716
env:
1817
- PLAT=aarch64
1918
- MB_ML_VER=_1_1
19+
- INTERFACE64=0
2020
- MB_ML_LIBC=musllinux
2121
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
2222
- os: linux
@@ -32,6 +32,7 @@ matrix:
3232
env:
3333
- PLAT=aarch64
3434
- MB_ML_VER=2014
35+
- INTERFACE64=0
3536
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
3637
- os: linux
3738
arch: arm64
@@ -45,6 +46,7 @@ matrix:
4546
env:
4647
- PLAT=s390x
4748
- MB_ML_VER=2014
49+
- INTERFACE64=0
4850
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
4951
- os: linux
5052
arch: s390x
@@ -58,6 +60,7 @@ matrix:
5860
env:
5961
- PLAT=ppc64le
6062
- MB_ML_VER=2014
63+
- INTERFACE64=0
6164
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
6265
- os: linux
6366
arch: ppc64le
@@ -84,18 +87,15 @@ script:
8487
# Build library and collect into libs subdirectory
8588
- |
8689
if [ ${TRAVIS_EVENT_TYPE} == "cron" ]; then
87-
build_lib "$PLAT" "$INTERFACE64" 1
90+
travis wait build_lib "$PLAT" "$INTERFACE64" 1
8891
version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
8992
sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
9093
else
91-
build_lib "$PLAT" "$INTERFACE64" 0
94+
travis wait build_lib "$PLAT" "$INTERFACE64" 0
9295
fi
9396
- libc=${MB_ML_LIBC:-manylinux}
9497
- docker_image=quay.io/pypa/${libc}${MB_ML_VER}_${PLAT}
95-
- docker run --rm -e INTERFACE64="${INTERFACE64}" \
96-
-e MB_ML_LIBC="${MB_ML_LIBC}" \
97-
-v $(pwd):/openblas $docker_image \
98-
/bin/bash -xe /openblas/tools/build_wheel.sh
98+
- 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
9999

100100
after_success:
101101
- set +ex

OpenBLAS

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ build-backend = "setuptools.build_meta"
88

99
[project]
1010
name = "scipy-openblas64"
11-
version = "0.3.27.63.1"
11+
# v0.3.27-341-g09298658
12+
version = "0.3.27.341.0"
1213
requires-python = ">=3.7"
1314
description = "Provides OpenBLAS for python packaging"
1415
readme = "README.md"

tools/build_steps.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ function build_lib {
6363
# BUILD_PREFIX - install suffix e.g. "/usr/local"
6464
# GFORTRAN_DMG
6565
# MB_ML_VER
66+
echo running build_lib
6667
set -x
6768
local plat=${1:-$PLAT}
6869
local interface64=${2:-$INTERFACE64}
@@ -71,13 +72,16 @@ function build_lib {
7172
# Make directory to store built archive
7273
if [ -n "$IS_OSX" ]; then
7374
# Do build, add gfortran hash to end of name
75+
echo building on macox since IS_OSX is defined
7476
wrap_wheel_builder do_build_lib "$plat" "gf_${GFORTRAN_SHA:0:7}" "$interface64" "$nightly"
7577
return
7678
fi
7779
# Manylinux wrapper
7880
local libc=${MB_ML_LIBC:-manylinux}
7981
local docker_image=quay.io/pypa/${libc}${manylinux}_${plat}
82+
echo pulling image ${docker_image}
8083
docker pull $docker_image
84+
echo done pulling image, starting docker run
8185
# Docker sources this script, and runs `do_build_lib`
8286
docker run --rm \
8387
-e BUILD_PREFIX="$BUILD_PREFIX" \
@@ -89,6 +93,7 @@ function build_lib {
8993
-e MB_ML_LIBC=${libc} \
9094
-v $PWD:/io \
9195
$docker_image /io/tools/docker_build_wrap.sh
96+
echo done docker run of docker_build_wrap.sh
9297
}
9398

9499
function patch_source {
@@ -172,7 +177,10 @@ function do_build_lib {
172177
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
173178
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
174179
USE_OPENMP=0 NUM_THREADS=64 \
175-
BINARY=$bitness $interface_flags $target_flags > /dev/null
180+
BINARY=$bitness $interface_flags $target_flags shared > /dev/null
181+
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
182+
USE_OPENMP=0 NUM_THREADS=64 \
183+
BINARY=$bitness $interface_flags $target_flags tests
176184
make PREFIX=$BUILD_PREFIX $interface_flags install
177185
popd
178186
stop_spinner

0 commit comments

Comments
 (0)