From f91ebe5933fd856759c97f1dd5f5f0a7f88b21ba Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Mon, 30 Jul 2018 18:47:41 +0200 Subject: [PATCH] ci: switch to Ubuntu builds on Travis - use precompiled IGC from ppa Signed-off-by: Jacek Danecki https://github.com/intel/compute-runtime/pull/71 Change-Id: I29e073b337c9d5c136266e2dc55bb230d872c9b4 --- .travis.yml | 30 ------------------- .../docker/Dockerfile-ubuntu-16.04-clang-4 | 9 +++--- .../docker/Dockerfile-ubuntu-16.04-clang-5 | 9 +++--- scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 | 12 -------- .../docker/Dockerfile-ubuntu-18.04-clang-4 | 10 ++++--- .../docker/Dockerfile-ubuntu-18.04-clang-5 | 10 ++++--- .../docker/Dockerfile-ubuntu-18.04-clang-6 | 10 ++++--- scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 | 12 -------- scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 | 15 +++++----- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 | 15 +++++----- scripts/prepare-workspace.sh | 3 -- 11 files changed, 44 insertions(+), 91 deletions(-) delete mode 100644 scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 delete mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 diff --git a/.travis.yml b/.travis.yml index 7def267994..2277181ac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ git: depth: false matrix: include: - - os: linux - compiler: gcc - env: BUILD_OS=ubuntu-16.04 COMPILER=gcc-5 - os: linux compiler: clang env: BUILD_OS=ubuntu-16.04 COMPILER=clang-4 @@ -26,39 +23,12 @@ matrix: - os: linux compiler: clang env: BUILD_OS=ubuntu-18.04 COMPILER=clang-6 - - os: linux - compiler: gcc - env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-5 - os: linux compiler: gcc env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-6 - os: linux compiler: gcc env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-7 - - os: linux - compiler: gcc - env: BUILD_OS=arch COMPILER=gcc-5 - - os: linux - compiler: gcc - env: BUILD_OS=arch COMPILER=gcc-8 GEN=gen-8 - - os: linux - compiler: gcc - env: BUILD_OS=arch COMPILER=gcc-8 GEN=gen-9 - - os: linux - compiler: clang - env: BUILD_OS=arch COMPILER=clang-6 - - os: linux - compiler: gcc - env: BUILD_OS=fedora-27 COMPILER=gcc-7 - - os: linux - compiler: clang - env: BUILD_OS=fedora-27 COMPILER=clang-5 - - os: linux - compiler: gcc - env: BUILD_OS=fedora-28 COMPILER=gcc-8 - - os: linux - compiler: clang - env: BUILD_OS=fedora-28 COMPILER=clang-6 script: ./scripts/run-build.sh diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 b/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 index 556e1b80ab..614393f76f 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 @@ -2,11 +2,12 @@ FROM docker.io/ubuntu:16.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake git wget pkg-config ninja-build clang-4.0 -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev clang-4.0 +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-4.0 -DCMAKE_CXX_COMPILER=clang++-4.0 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 b/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 index 339c2b7d2e..d17313c2a7 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 @@ -2,11 +2,12 @@ FROM docker.io/ubuntu:16.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake git wget pkg-config ninja-build clang-5.0 -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev clang-5.0 +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-5.0 -DCMAKE_CXX_COMPILER=clang++-5.0 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 deleted file mode 100644 index 8340d1c192..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 +++ /dev/null @@ -1,12 +0,0 @@ -FROM docker.io/ubuntu:16.04 -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake g++-5 git wget pkg-config ninja-build -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 index 89377e62d1..6b23a72097 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 @@ -2,11 +2,13 @@ FROM docker.io/ubuntu:18.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake git wget pkg-config ninja-build clang-4.0 -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev clang-4.0 +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-4.0 -DCMAKE_CXX_COMPILER=clang++-4.0 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 index 99e3b02165..d5fb963d19 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 @@ -2,11 +2,13 @@ FROM docker.io/ubuntu:18.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake git wget pkg-config ninja-build clang-5.0 -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev clang-5.0 +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-5.0 -DCMAKE_CXX_COMPILER=clang++-5.0 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 index a8de487e65..ded121848c 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 @@ -2,11 +2,13 @@ FROM docker.io/ubuntu:18.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake git wget pkg-config ninja-build clang-6.0 -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev clang-6.0 +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 deleted file mode 100644 index 0ca64cd1a7..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 +++ /dev/null @@ -1,12 +0,0 @@ -FROM docker.io/ubuntu:18.04 -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake g++-5 git wget pkg-config ninja-build -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 index 97edce8981..50e2b1edd5 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 @@ -2,11 +2,12 @@ FROM docker.io/ubuntu:18.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake g++-6 git wget pkg-config ninja-build -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build intel-igc-opencl-dev +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 ../neo; \ + ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 index 655876ac36..4630447d0d 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 @@ -2,11 +2,12 @@ FROM docker.io/ubuntu:18.04 MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN apt-get -y update; apt-get install -y --allow-unauthenticated cmake g++-7 git wget pkg-config ninja-build -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build intel-igc-opencl-dev +RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 ../neo; \ + ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/prepare-workspace.sh b/scripts/prepare-workspace.sh index ab4f22716e..07cece4c13 100755 --- a/scripts/prepare-workspace.sh +++ b/scripts/prepare-workspace.sh @@ -21,8 +21,5 @@ cd /root git clone --depth 1 https://github.com/intel/gmmlib gmmlib -pushd neo/scripts/igc -./prepare.sh -popd mkdir build