Skip to content

Commit 1c97be9

Browse files
committed
use new LIBNAMEPREFIX, LIBNAMESUFFIS, FIXED_LIBNAME options instead of patching
1 parent d65af28 commit 1c97be9

File tree

8 files changed

+10
-194
lines changed

8 files changed

+10
-194
lines changed

.github/workflows/posix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
INTERFACE64: '1'
4848
env:
4949
REPO_DIR: OpenBLAS
50-
OPENBLAS_COMMIT: "v0.3.26"
50+
OPENBLAS_COMMIT: "5403900539"
5151
NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
5252
MACOSX_DEPLOYMENT_TARGET: 10.9
5353
MB_PYTHON_VERSION: ${{ matrix.python-version }}

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ main ]
88

99
env:
10-
OPENBLAS_COMMIT: "v0.3.26"
10+
OPENBLAS_COMMIT: "5403900539"
1111
OPENBLAS_ROOT: "c:\\opt"
1212
# Preserve working directory for calls into bash
1313
# Without this, invoking bash will cd to the home directory

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ env:
22
global:
33
# The archive that gets built has name from ``git describe`` on this
44
# commit.
5-
- OPENBLAS_COMMIT="v0.3.26"
5+
- OPENBLAS_COMMIT="5403900539"
66
- REPO_DIR=OpenBLAS
77

88
language: python

OpenBLAS

patches/0001-create-a-single-shared-object.patch

Lines changed: 0 additions & 185 deletions
This file was deleted.

pyproject.toml

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

99
[project]
1010
name = "scipy-openblas64"
11-
version = "0.3.26.0.4"
11+
version = "0.3.26.238.0"
1212
requires-python = ">=3.7"
1313
description = "Provides OpenBLAS for python packaging"
1414
readme = "README.md"

tools/build_openblas.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ fflags="$fextra $cflags -frecursive -ffpe-summary=invalid,zero"
7777
# Set suffixed-ILP64 flags
7878
if [ "$if_bits" == "64" ]; then
7979
SYMBOLSUFFIX="64_"
80-
interface_flags="INTERFACE64=1 SYMBOLSUFFIX=${SYMBOLSUFFIX}"
80+
interface_flags="INTERFACE64=1 SYMBOLSUFFIX=${SYMBOLSUFFIX} LIBNAMESUFFIX=${SYMBOLSUFFIX}"
8181
# We override FCOMMON_OPT, so we need to set default integer manually
8282
fflags="$fflags -fdefault-integer-8"
8383
else
8484
interface_flags=""
8585
fi
86-
interface_flags="$interface_flags SYMBOLPREFIX=scipy_"
86+
interface_flags="$interface_flags SYMBOLPREFIX=scipy_ LIBNAMEPREFIX=scipy_ FIXED_LIBNAME=1"
8787

8888
# Build name for output library from gcc version and OpenBLAS commit.
8989
GCC_TAG="gcc_$(gcc -dumpversion | tr .- _)"

tools/build_steps.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,18 @@ function do_build_lib {
149149
esac
150150
case $interface64 in
151151
1)
152-
local interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ SYMBOLPREFIX=scipy_ OBJCONV=$PWD/objconv/objconv";
152+
local interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ LIBNAMESUFFIX=64_ OBJCONV=$PWD/objconv/objconv";
153153
local symbolsuffix="64_";
154154
if [ -n "$IS_OSX" ]; then
155155
$PWD/objconv/objconv --help
156156
fi
157157
;;
158158
*)
159-
local interface_flags="SYMBOLPREFIX=scipy_ OBJCONV=$PWD/objconv/objconv"
159+
local interface_flags="OBJCONV=$PWD/objconv/objconv"
160160
local symbolsuffix="";
161161
;;
162162
esac
163+
interface_flags="$interface_flags SYMBOLPREFIX=scipy_ LIBNAMEPREFIX=scipy_ FIXED_LIBNAME=1"
163164
mkdir -p libs
164165
start_spinner
165166
set -x

0 commit comments

Comments
 (0)