Skip to content

Commit 27f3f6e

Browse files
committed
Let go back to manylinux1 image
1 parent 9f93811 commit 27f3f6e

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.docker/wheel/build_wheels.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
NPROC=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
7-
NUM_WORKERS=$((NPROC/2))
7+
NUM_WORKERS=$((NPROC-1))
88

99
if [ "$TRAVIS" == "true" ]; then
1010
NUM_WORKERS=2
@@ -27,7 +27,7 @@ GSL_STATIC_LIBS="/usr/local/lib/libgsl.a;/usr/local/lib/libgslcblas.a"
2727
CMAKE=/usr/bin/cmake3
2828

2929
# Build wheels here.
30-
for PYV in 36 27; do
30+
for PYV in 38 37 36 27; do
3131
PYDIR=/opt/python/cp${PYV}-cp${PYV}m
3232
cd $MOOSE_SOURCE_DIR
3333
echo "Building using $PYDIR in $PYVER"
@@ -40,8 +40,11 @@ for PYV in 36 27; do
4040
$PYTHON -m pip install matplotlib
4141
fi
4242
$PYTHON -m pip install wheel
43-
$PYTHON setup.py build --with-gsl-static
44-
$PYTHON setup.py bdist_wheel -w $WHEELHOUSE
43+
# $PYTHON setup.py build_ext --with-gsl-static
44+
# $PYTHON setup.py bdist_wheel
45+
# Don't build numpy. Use wheel.
46+
export GSL_USE_STATIC_LIBRARIES=1
47+
$PYTHON -m pip wheel --verbose --no-deps . -w $WHEELHOUSE
4548
echo "Content of WHEELHOUSE"
4649
ls -lh $WHEELHOUSE/*.whl
4750
done

cmake/FindGSL.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ IF(WIN32)
5555

5656
ELSE(WIN32)
5757
# UNIX
58-
IF(GSL_USE_STATIC_LIBRARIES)
58+
if(GSL_USE_STATIC_LIBRARIES OR $ENV{GSL_USE_STATIC_LIBRARIES})
5959
SET(GSL_LIB_NAMES libgsl.a)
6060
SET(GSL_CBLAS_LIB_NAMES libgslcblas.a)
61-
ELSE(GSL_USE_STATIC_LIBRARIES)
61+
else()
6262
SET(GSL_LIB_NAMES gsl)
6363
SET(GSL_CBLAS_LIB_NAMES gslcblas)
64-
ENDIF( )
64+
endif( )
6565

6666
if(GSL_ROOT_DIR)
6767
FIND_LIBRARY(GSL_LIB

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __init__(self, name, **kwargs):
6464
# passing `optional=True` to the argument. With python2 there is no
6565
# getaway from it.
6666
f = tempfile.NamedTemporaryFile(suffix='.cpp', delete=False)
67-
f.write('int main() { return 1; }')
67+
f.write(b'int main() { return 1; }')
6868
Extension.__init__(self, name, sources=[f.name], **kwargs)
6969
f.close()
7070

0 commit comments

Comments
 (0)