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.

Sign up for GitHub

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

Wheels: 0.13.4.post1 #1013

Merged
merged 6 commits into from
Jun 17, 2021
Merged

Wheels: 0.13.4.post1 #1013

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44b7916
Wheels: Blosc Pthread
ax3l Jun 16, 2021
5d52fbd
blosc/ADIOS2: show flags
ax3l Jun 16, 2021
e43141d
Unix: Patch Blosc (Pthreads)
ax3l Jun 16, 2021
0063880
ADIOS2: Prefer CONFIG mode for Blosc
ax3l Jun 17, 2021
7491ab5
ADIOS2: Patch FindBlosc.cmake (Threads)
ax3l Jun 17, 2021
1a71ea3
setup.py: bump version to 0.13.4.post1
ax3l Jun 17, 2021
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
13 changes: 8 additions & 5 deletions library_builders.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ function build_adios2 {
if [ "$(uname -s)" = "Linux" ]
then
EVPATH_ZPL="ON"
# ADIOS 2.7.1 & Blosc 1.20.1/1.21.0
# /usr/local/lib/libblosc.a(blosc.c.o): In function `blosc_init.part.9':
# blosc.c:(.text+0x43e): undefined reference to `pthread_atfork'
export LDFLAGS="-pthread"
else
# ZPL in EVPATH disabled because it does not build with older macOS
# https://github.com/GTkorvo/evpath/issues/47
Expand Down Expand Up @@ -137,7 +133,14 @@ function build_blosc {
cd build-c-blosc
PY_BIN=$(which python)
CMAKE_BIN="$(${PY_BIN} -m pip show cmake 2>/dev/null | grep Location | cut -d' ' -f2)/cmake/data/bin/"
PATH=${CMAKE_BIN}:${PATH} cmake -DDEACTIVATE_SNAPPY=ON -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} ../c-blosc-*
PATH=${CMAKE_BIN}:${PATH} cmake \
-DDEACTIVATE_SNAPPY=ON \
-DBUILD_SHARED=OFF \
-DBUILD_TESTS=OFF \
-DBUILD_BENCHMARKS=OFF \
-DTHREADS_PREFER_PTHREAD_FLAG=ON \
ax3l marked this conversation as resolved.
Show resolved Hide resolved
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} \
../c-blosc-*
make -j${CPU_COUNT}
make install
cd -
Expand Down