Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -32,6 +32,7 @@ matrix:
env:
- PLAT=aarch64
- MB_ML_VER=2014
- INTERFACE64=0
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: arm64
Expand All @@ -45,6 +46,7 @@ matrix:
env:
- PLAT=s390x
- MB_ML_VER=2014
- INTERFACE64=0
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: s390x
Expand All @@ -58,6 +60,7 @@ matrix:
env:
- PLAT=ppc64le
- MB_ML_VER=2014
- INTERFACE64=0
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: ppc64le
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion OpenBLAS
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 9 additions & 1 deletion tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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" \
Expand All @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
Loading