Skip to content

Commit e1efeba

Browse files
authored
Merge pull request #181 from mattip/shrink3
refactor to acutally use DYNAMIC_LIST
2 parents ed533b8 + fca3050 commit e1efeba

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

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.27.44.5"
11+
version = "0.3.27.44.6"
1212
requires-python = ">=3.7"
1313
description = "Provides OpenBLAS for python packaging"
1414
readme = "README.md"

tools/build_steps.sh

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function patch_source {
9797
for f in $(ls ../patches); do
9898
echo applying patch $f
9999
git apply ../patches/$f
100-
done
100+
done
101101
}
102102

103103
function do_build_lib {
@@ -119,34 +119,34 @@ function do_build_lib {
119119
case $(get_os)-$plat in
120120
Linux-x86_64)
121121
local bitness=64
122-
local target_flags="TARGET=PRESCOTT"
122+
local target="PRESCOTT"
123123
local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
124124
;;
125125
Darwin-x86_64)
126126
local bitness=64
127-
local target_flags="TARGET=CORE2"
127+
local target="CORE2"
128128
# Pick up the gfortran runtime libraries
129129
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
130130
;;
131131
*-i686)
132132
local bitness=32
133-
local target_flags="TARGET=PRESCOTT"
133+
local target="PRESCOTT"
134134
local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
135135
;;
136136
Linux-aarch64)
137137
local bitness=64
138-
local target_flags="TARGET=ARMV8"
138+
local target="ARMV8"
139139
;;
140140
Darwin-arm64)
141141
local bitness=64
142-
local target_flags="TARGET=VORTEX"
142+
local target="VORTEX"
143143
;;
144144
*-s390x)
145145
local bitness=64
146146
;;
147147
*-ppc64le)
148148
local bitness=64
149-
local target_flags="TARGET=POWER8"
149+
local target="POWER8"
150150
;;
151151
*) echo "Strange plat value $plat"; exit 1 ;;
152152
esac
@@ -172,20 +172,18 @@ function do_build_lib {
172172
echo start building
173173
if [ -v dynamic_list ]; then
174174
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
175-
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
175+
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
176176
USE_OPENMP=0 NUM_THREADS=64 \
177177
DYNAMIC_LIST="$dynamic_list" \
178-
BINARY=$bitness $interface_flags $target_flags shared 2>&1 1>/dev/null
178+
BINARY="$bitness" $interface_flags \
179+
TARGET="$target"
179180
else
180181
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
181-
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
182+
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
182183
USE_OPENMP=0 NUM_THREADS=64 \
183-
BINARY=$bitness $interface_flags $target_flags shared 2>&1 1>/dev/null
184+
BINARY="$bitness" $interface_flags \
185+
TARGET="$target"
184186
fi
185-
echo done building, now testing
186-
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
187-
USE_OPENMP=0 NUM_THREADS=64 \
188-
BINARY=$bitness $interface_flags $target_flags tests
189187
make PREFIX=$BUILD_PREFIX $interface_flags install
190188
popd
191189
if [ "$nightly" = "1" ]; then

0 commit comments

Comments
 (0)