Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit 6d8dcd6

Browse files
committed
WIP: add aarch64, ppc64le, x390x wheels; change build slightly
1 parent 11d6d89 commit 6d8dcd6

8 files changed

+82
-56
lines changed

.travis.yml.back

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55
- BUILD_COMMIT=e94cec800304a6a467cf90ce4e7d3e207770b4b4
66
- BUILD_DEPENDS=cython
77
- TEST_DEPENDS="pytest hypothesis"
8+
- TEST_DEPENDS=pytest
89
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
910
# Following generated with
1011
# travis encrypt -r MacPython/numpy-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
@@ -23,6 +24,7 @@ jobs:
2324
include:
2425
- os: linux
2526
env:
27+
- PLAT=x86_64
2628
- MB_PYTHON_VERSION=3.6
2729
- MB_ML_VER=2010
2830
- PLAT=x86_64
@@ -35,6 +37,7 @@ jobs:
3537
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
3638
- os: linux
3739
env:
40+
- PLAT=x86_64
3841
- MB_PYTHON_VERSION=3.7
3942
- MB_ML_VER=2010
4043
- PLAT=x86_64
@@ -47,6 +50,7 @@ jobs:
4750
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
4851
- os: linux
4952
env:
53+
- PLAT=x86_64
5054
- MB_PYTHON_VERSION=3.8
5155
- MB_ML_VER=2010
5256
- PLAT=x86_64
@@ -61,20 +65,65 @@ jobs:
6165
language: generic
6266
osx_image: xcode10.1
6367
env:
68+
- PLAT=x86_64
6469
- MB_PYTHON_VERSION=3.6
6570
- MB_PYTHON_OSX_VER=10.9
6671
- os: osx
6772
language: generic
6873
osx_image: xcode10.1
6974
env:
75+
- PLAT=x86_64
7076
- MB_PYTHON_VERSION=3.7
7177
- MB_PYTHON_OSX_VER=10.9
7278
- os: osx
7379
language: generic
7480
osx_image: xcode10.1
7581
env:
82+
- PLAT=x86_64
7683
- MB_PYTHON_VERSION=3.8
7784
- MB_PYTHON_OSX_VER=10.9
85+
- os: linux
86+
arch: arm64
87+
env:
88+
- PLAT=aarch64
89+
- MB_ML_VER=2014
90+
- MB_PYTHON_VERSION=3.6
91+
- DEBUG_PRINT=1
92+
- os: linux
93+
arch: s390x
94+
env:
95+
- PLAT=s390x
96+
- MB_ML_VER=2014
97+
- MB_PYTHON_VERSION=3.6
98+
- DEBUG_PRINT=1
99+
- os: linux
100+
arch: ppc64le
101+
env:
102+
- PLAT=ppc64le
103+
- MB_ML_VER=2014
104+
- MB_PYTHON_VERSION=3.6
105+
- DEBUG_PRINT=1
106+
- os: linux
107+
arch: arm64
108+
env:
109+
- PLAT=aarch64
110+
- MB_ML_VER=2014
111+
- MB_PYTHON_VERSION=3.7
112+
- DEBUG_PRINT=1
113+
- os: linux
114+
arch: s390x
115+
env:
116+
- PLAT=s390x
117+
- MB_ML_VER=2014
118+
- MB_PYTHON_VERSION=3.7
119+
- DEBUG_PRINT=1
120+
- os: linux
121+
arch: ppc64le
122+
env:
123+
- PLAT=ppc64le
124+
- MB_ML_VER=2014
125+
- MB_PYTHON_VERSION=3.7
126+
- DEBUG_PRINT=1
78127

79128
before_install:
80129
- if [ "$TRAVIS_BRANCH" == "master" ]; then
@@ -87,22 +136,13 @@ before_install:
87136
fi
88137
# Set DEBUG_PRINT environment variable in settings
89138
- if [ -n "${DEBUG_PRINT}" ]; then set -x; fi
90-
- source multibuild/common_utils.sh
91-
- source multibuild/travis_steps.sh
92-
- before_install
139+
- ./travis_before_install.sh
93140

94141
install:
95-
# Maybe get and clean and patch source
96-
- clean_code $REPO_DIR $BUILD_COMMIT
97-
- ./patch_code.sh $REPO_DIR
98-
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
99-
export CFLAGS=${CFLAGS}" -Wno-sign-compare -Wno-unused-result\
100-
-Wno-strict-aliasing";
101-
fi
102-
- build_wheel $REPO_DIR $PLAT
142+
- ./travis_install.sh
103143

104144
script:
105-
- install_run $PLAT
145+
- ./travis_script.sh
106146

107147
after_success:
108148
# Upload wheels to Rackspace container

config.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ function build_wheel {
1212
# For manylinux2010 builds with manylinux1 openblas builds
1313
$use_sudo yum install -y libgfortran-4.4.7
1414
fi
15+
echo gcc --version
16+
echo `gcc --version`
1517
build_libs $lib_plat
1618
# Fix version error for development wheels by using bdist_wheel
1719
build_bdist_wheel $@

env_vars.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
# Environment variables for build
3-
OPENBLAS_VERSION="v0.3.7"
3+
OPENBLAS_VERSION="v0.3.5-605-gc815b8fb" # the 0.3.5 is misleading, this is 0.3.8dev
44
MACOSX_DEPLOYMENT_TARGET=10.9
55
CFLAGS="-std=c99 -fno-strict-aliasing"
66
# Macos's linker doesn't support stripping symbols
@@ -13,3 +13,6 @@ if [ "$(uname)" != "Darwin" ]; then
1313
# the current version of manybuild pass "-strip-all" to CPPFLAGS and FFLAGS
1414
STRIP_FLAGS=""
1515
fi
16+
# For verbosity: report where each command came from
17+
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
18+
set -x

openblas_support.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

travis_before_install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
source multibuild/common_utils.sh
4+
source multibuild/travis_steps.sh
5+
before_install
6+

travis_install.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
source multibuild/common_utils.sh
4+
source multibuild/travis_steps.sh
5+
# Maybe get and clean and patch source
6+
clean_code $REPO_DIR $BUILD_COMMIT
7+
./patch_code.sh $REPO_DIR
8+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
9+
export CFLAGS=${CFLAGS}" -Wno-sign-compare -Wno-unused-result\
10+
-Wno-strict-aliasing";
11+
fi
12+
build_wheel $REPO_DIR $PLAT

travis_script.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
source multibuild/common_utils.sh
4+
source multibuild/travis_steps.sh
5+
install_run $PLAT

0 commit comments

Comments
 (0)