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

Wheels: 0.13.4.post1 #1013

Merged
merged 6 commits into from
Jun 17, 2021
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 .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
uses: suisei-cn/actions-download-file@v1
id: setupversion
with:
url: "https://gist.githubusercontent.com/ax3l/ee247f0705f918f8b4e325075230f015/raw/8357643c15b99d9048505a729c398312ddd8f152/setupversion.patch"
url: "https://gist.githubusercontent.com/ax3l/4db2f1744e0e28e6c013ee4e752b3cb7/raw/324bdb60894d51608a48890573654e10e1b1c3a0/setupversion.patch"
target: src/.patch/

- name: Apply Patch
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ install:
before_script:
- mkdir -p src/.patch
- cd src/.patch
- curl -sOL https://gist.githubusercontent.com/ax3l/ee247f0705f918f8b4e325075230f015/raw/8357643c15b99d9048505a729c398312ddd8f152/setupversion.patch
- curl -sOL https://gist.githubusercontent.com/ax3l/4db2f1744e0e28e6c013ee4e752b3cb7/raw/324bdb60894d51608a48890573654e10e1b1c3a0/setupversion.patch
- cd ..
- python3 -m patch .patch/setupversion.patch
- cd ..
Expand Down
27 changes: 22 additions & 5 deletions library_builders.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ function install_buildessentials {
python -m pip install -U pip setuptools wheel
python -m pip install -U scikit-build
python -m pip install -U cmake
python -m pip install -U "patch==1.*"

touch buildessentials-stamp
}
Expand Down Expand Up @@ -85,17 +86,19 @@ function build_adios2 {
file adios2*.tar.gz
tar -xzf adios2*.tar.gz
rm adios2*.tar.gz

# Patch PThread Propagation
curl -sLo adios-pthread.patch \
https://patch-diff.githubusercontent.com/raw/ornladios/ADIOS2/pull/2768.patch
python -m patch -p 1 -d ADIOS2-2.7.1 adios-pthread.patch

mkdir build-ADIOS2
cd build-ADIOS2
PY_BIN=$(which python)
CMAKE_BIN="$(${PY_BIN} -m pip show cmake 2>/dev/null | grep Location | cut -d' ' -f2)/cmake/data/bin/"
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 All @@ -114,6 +117,7 @@ function build_adios2 {
-DADIOS2_RUN_INSTALL_TEST=OFF \
-DEVPATH_USE_ZPL_ENET=${EVPATH_ZPL} \
-DHDF5_USE_STATIC_LIBRARIES:BOOL=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE \
-DCMAKE_DISABLE_FIND_PACKAGE_BISON=TRUE \
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} ../ADIOS2-*
Expand All @@ -133,11 +137,24 @@ function build_blosc {
file c-blosc*.tar.gz
tar -xzf c-blosc*.tar.gz
rm c-blosc*.tar.gz

# Patch PThread Propagation
curl -sLo blosc-pthread.patch \
https://patch-diff.githubusercontent.com/raw/Blosc/c-blosc/pull/318.patch
python -m patch -p 1 -d c-blosc-1.21.0 blosc-pthread.patch

mkdir build-c-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 \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} \
../c-blosc-*
make -j${CPU_COUNT}
make install
cd -
Expand Down