Skip to content

Commit 0bdf65d

Browse files
committed
Exclude i686
and clean-up
1 parent 0a34796 commit 0bdf65d

File tree

3 files changed

+29
-12
lines changed

3 files changed

+29
-12
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
CIBW_SKIP: cp27-* pp27-* *-win32 *-manylinux_i686 *win*
4343
# Install dependencies on Linux and OSX
4444
CIBW_BEFORE_BUILD: bash -x .github/library_builders.sh
45-
# CMake shall search for static dependencies of HDF5 and ADIOS1
46-
HDF5_USE_STATIC_LIBRARIES: ON
47-
ADIOS_USE_STATIC_LIBS: ON
45+
# for the openPMD-api build, CMake shall search for
46+
# static dependencies of HDF5 and ADIOS1 (see setup.py)
47+
CIBW_ENVIRONMENT: HDF5_USE_STATIC_LIBRARIES='ON' ADIOS_USE_STATIC_LIBS='ON'
4848
run: |
4949
cd src
5050
python setup.py sdist --dist-dir ../wheelhouse

.travis.yml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,45 @@ branches:
66

77
env:
88
global:
9+
- OPENPMD_GIT_REF="0.11.1-alpha"
10+
911
# (1,2) Skip building for Python 2.7 on all platforms
10-
- CIBW_SKIP="cp27-* pp27-*"
12+
# (3) GNU 7.3.1 & MPark.Variant 1.4.0 on i686:
13+
# https://github.com/pypa/manylinux/issues/543
14+
# variant.hpp:2241:9: internal compiler error:
15+
# unexpected expression ‘I’ of kind template_parm_index
16+
# typename T = lib::type_pack_element_t<I, Ts...>,
17+
- CIBW_SKIP="cp27-* pp27-* *-manylinux_i686"
1118
# Install dependencies on Linux and OSX
1219
- CIBW_BEFORE_BUILD="bash -x .github/library_builders.sh"
20+
# for the openPMD-api build, CMake shall search for
21+
# static dependencies of HDF5 and ADIOS1 (see setup.py)
22+
- CIBW_ENVIRONMENT="HDF5_USE_STATIC_LIBRARIES='ON' ADIOS_USE_STATIC_LIBS='ON'"
1323

1424
jobs:
1525
include:
1626
# perform a linux ARMv8 build
17-
- services: docker
18-
arch: aarch64
27+
# blocked by https://github.com/scikit-build/cmake-python-distributions/issues/96
28+
# https://github.com/pypa/manylinux/issues/544
29+
# - services: docker
30+
# arch: arm64
31+
# env:
32+
# - CIBW_BUILD="*_aarch64"
1933

2034
# perform a linux PPC64LE build
2135
# blocked by https://github.com/pypa/auditwheel/issues/36
2236
# https://github.com/pypa/auditwheel/pull/213
2337
# - services: docker
2438
# arch: ppc64le
39+
# env:
40+
# - CIBW_BUILD="*_ppc64le"
2541

2642
# perform a linux S390X build
2743
# blocked by https://github.com/GTkorvo/dill/issues/15
2844
# - services: docker
2945
# arch: s390x
46+
# env:
47+
# - CIBW_BUILD="*_s390x"
3048

3149
# and a build for old macOS versions (10.13 with xcode9.4.1 ~2017)
3250
- os: osx
@@ -35,7 +53,7 @@ jobs:
3553
python: 3.6
3654

3755
install:
38-
- git clone --branch 0.11.1-alpha --depth 1 https://github.com/openPMD/openPMD-api.git src
56+
- git clone --branch ${OPENPMD_GIT_REF} --depth 1 https://github.com/openPMD/openPMD-api.git src
3957
- cp library_builders.sh src/.github/
4058
- python3 -m pip install cibuildwheel==1.3.0
4159

library_builders.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ function build_adios1 {
5656
if [ -e adios1-stamp ]; then return; fi
5757

5858
# avoid picking up a static libpthread in adios (also: those libs lack -fPIC)
59-
# rm /usr/lib64/libpthread.a /usr/lib64/libm.a /usr/lib64/librt.a
59+
if [ "$(uname -s)" = "Linux" ]
60+
then
61+
rm -f /usr/lib64/libpthread.a /usr/lib64/libm.a /usr/lib64/librt.a
62+
fi
6063

6164
curl -sLo adios-1.13.1.tar.gz \
6265
http://users.nccs.gov/~pnorbert/adios-1.13.1.tar.gz
@@ -152,10 +155,6 @@ function build_hdf5 {
152155
export CFLAGS+=" -fPIC"
153156
export CXXFLAGS+=" -fPIC"
154157

155-
# CMake shall search for static dependencies of HDF5 and ADIOS1
156-
export HDF5_USE_STATIC_LIBRARIES="ON"
157-
export ADIOS_USE_STATIC_LIBS="ON"
158-
159158
install_buildessentials
160159
build_blosc
161160
build_hdf5

0 commit comments

Comments
 (0)