Skip to content

manylinux_2_24: Use gcc-9 & binutils 2.36.1 #57

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

Closed
wants to merge 6 commits into from
Closed

manylinux_2_24: Use gcc-9 & binutils 2.36.1 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ae39ff
add manylinux_2_24 builds
mattip Feb 28, 2021
bf2a9b8
update submodules
mattip Feb 28, 2021
8193413
change job names
mattip Apr 8, 2021
83fb573
update multibuild
mattip Apr 8, 2021
82d5187
[manylinux_2_24] Use gcc-9 & binutils 2.36.1
mayeut Apr 10, 2021
bd2abcf
Update OpenBLAS commit to d6cf677
mayeut Apr 20, 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
6 changes: 2 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# This is a basic workflow to help you get started with Actions

name: Windows build
name: Windows

defaults:
run:
Expand All @@ -13,7 +11,7 @@ on:
branches: [ master ]

env:
OPENBLAS_COMMIT: "af2b0d0"
OPENBLAS_COMMIT: "d6cf677"
OPENBLAS_ROOT: "c:\\opt"

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/multibuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linux,macOS build
name: Posix

on:
push:
Expand All @@ -19,7 +19,7 @@ jobs:
platform: [x64]
PLAT: [i686, x86_64]
INTERFACE64: ['', '1']
MB_ML_VER: ['', 2010, 2014]
MB_ML_VER: ['', 2010, 2014, '_2_24']
include:
- os: macos-latest
PLAT: arm64
Expand All @@ -36,7 +36,7 @@ jobs:
INTERFACE64: '1'
env:
REPO_DIR: OpenBLAS
OPENBLAS_COMMIT: af2b0d0
OPENBLAS_COMMIT: d6cf677
MACOSX_DEPLOYMENT_TARGET: 10.9
MB_PYTHON_VERSION: ${{ matrix.python-version }}
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
Expand Down
42 changes: 41 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ env:
global:
# The archive that gets built has name from ``git describe`` on this
# commit.
- OPENBLAS_COMMIT=af2b0d0
- OPENBLAS_COMMIT=d6cf677
- REPO_DIR=OpenBLAS
# Following generated with:
# travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN=<secret token value>
Expand Down Expand Up @@ -63,6 +63,46 @@ matrix:
- MB_ML_VER=2014
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}

- os: linux
arch: arm64
env:
- PLAT=aarch64
- MB_ML_VER=_2_24
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: arm64
env:
- PLAT=aarch64
- INTERFACE64=1
- MB_ML_VER=_2_24
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: s390x
env:
- PLAT=s390x
- MB_ML_VER=_2_24
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: s390x
env:
- PLAT=s390x
- INTERFACE64=1
- MB_ML_VER=_2_24
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: ppc64le
env:
- PLAT=ppc64le
- MB_ML_VER=_2_24
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: ppc64le
env:
- PLAT=ppc64le
- INTERFACE64=1
- MB_ML_VER=_2_24
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}

before_install:
- source travis-ci/build_steps.sh
- before_build
Expand Down
2 changes: 1 addition & 1 deletion multibuild
Open in desktop
Submodule multibuild updated 14 files
+15 −2 .travis.yml
+41 −16 README.rst
+57 −4 common_utils.sh
+10 −4 configure_build.sh
+3 −1 docker_build_wrap.sh
+16 −2 library_builders.sh
+9 −2 manylinux_utils.sh
+28 −8 osx_utils.sh
+11 −0 tests/test_common_utils.sh
+6 −5 tests/test_manylinux_utils_docker.sh
+6 −0 tests/test_multibuild.sh
+8 −4 tests/test_python_install.sh
+14 −0 travis_osx_steps.sh
+1 −1 travis_steps.sh
27 changes: 27 additions & 0 deletions travis-ci/docker_build_wrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,33 @@
# PLAT
set -e

if [ "${MB_ML_VER}" == "_2_24" ]; then
# Install gcc-9, gcc-6 is too old to build OpenBLAS
# OpenBLAS being C/Fortran, there's very little risk of
# symbol version issues
apt-get update -y
apt-get install -y --no-install-recommends dirmngr
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 1E9377A2BA9EF27F
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list
apt-get update -y
apt-get install -y --no-install-recommends gcc-9 gfortran-9
export CC=gcc-9
export FC=gfortran-9
# Install an up-to-date binutils
apt-get install -y --no-install-recommends bison flex gettext texinfo dejagnu quilt chrpath dwz debugedit python3 file xz-utils lsb-release zlib1g-dev procps
curl -fsSL https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz | tar -x --xz
pushd binutils-2.36.1
./configure > /dev/null
make -j$(nproc) > /dev/null
make install > /dev/null
popd
fi

${CC:-gcc} --version
${FC:-gfortran} --version
as --version
ld --version

# Change into root directory of repo
cd /io
source travis-ci/build_steps.sh
Expand Down