Skip to content
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

refactor to acutally use DYNAMIC_LIST #181

Merged
merged 1 commit into from
Aug 11, 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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "scipy-openblas64"
version = "0.3.27.44.5"
version = "0.3.27.44.6"
requires-python = ">=3.7"
description = "Provides OpenBLAS for python packaging"
readme = "README.md"
Expand Down
28 changes: 13 additions & 15 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function patch_source {
for f in $(ls ../patches); do
echo applying patch $f
git apply ../patches/$f
done
done
}

function do_build_lib {
Expand All @@ -119,34 +119,34 @@ function do_build_lib {
case $(get_os)-$plat in
Linux-x86_64)
local bitness=64
local target_flags="TARGET=PRESCOTT"
local target="PRESCOTT"
local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
;;
Darwin-x86_64)
local bitness=64
local target_flags="TARGET=CORE2"
local target="CORE2"
# Pick up the gfortran runtime libraries
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
;;
*-i686)
local bitness=32
local target_flags="TARGET=PRESCOTT"
local target="PRESCOTT"
local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
;;
Linux-aarch64)
local bitness=64
local target_flags="TARGET=ARMV8"
local target="ARMV8"
;;
Darwin-arm64)
local bitness=64
local target_flags="TARGET=VORTEX"
local target="VORTEX"
;;
*-s390x)
local bitness=64
;;
*-ppc64le)
local bitness=64
local target_flags="TARGET=POWER8"
local target="POWER8"
;;
*) echo "Strange plat value $plat"; exit 1 ;;
esac
Expand All @@ -172,20 +172,18 @@ function do_build_lib {
echo start building
if [ -v dynamic_list ]; then
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
USE_OPENMP=0 NUM_THREADS=64 \
DYNAMIC_LIST="$dynamic_list" \
BINARY=$bitness $interface_flags $target_flags shared 2>&1 1>/dev/null
BINARY="$bitness" $interface_flags \
TARGET="$target"
else
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
USE_OPENMP=0 NUM_THREADS=64 \
BINARY=$bitness $interface_flags $target_flags shared 2>&1 1>/dev/null
BINARY="$bitness" $interface_flags \
TARGET="$target"
fi
echo done building, now testing
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
USE_OPENMP=0 NUM_THREADS=64 \
BINARY=$bitness $interface_flags $target_flags tests
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this may have been the problem. I did it to break up the build and try to get some log files, since on TravisCI there is a hard limit on the size of the logs. But make test requires make shared, and the command here was without the DYNAMIC_LIST. So make rebuilt all the kernels :(.

make PREFIX=$BUILD_PREFIX $interface_flags install
popd
if [ "$nightly" = "1" ]; then
Expand Down
Loading