From 37136df1b44351d89a1d166e4fa2da7d27c35f8c Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Mon, 21 Oct 2019 12:20:04 +0200 Subject: [PATCH] ci: update builds scripts - build Neo for specific GEN to decrease build time on Travis - don't run aub tests on Arch on Semaphore to decrease disk size usage - cleanup in build scripts Signed-off-by: Jacek Danecki https://github.com/intel/compute-runtime/pull/227 Change-Id: I037ae1bc1e81fefe43e948453768bc83f0b18f63 --- .travis.yml | 39 ++++++++++++++-- scripts/build-arch-docker.sh | 2 +- scripts/build-fedora27-copr-docker.sh | 12 ----- scripts/build-fedora28-copr-docker.sh | 12 ----- scripts/build-fedora29-copr-docker.sh | 12 ----- ...{Dockerfile-arch-gcc-8 => Dockerfile-arch} | 7 +-- scripts/docker/Dockerfile-arch-aur-gcc-8 | 12 ----- scripts/docker/Dockerfile-arch-clang-6 | 14 ------ scripts/docker/Dockerfile-arch-gcc-5 | 14 ------ scripts/docker/Dockerfile-arch-gcc-8-gen-8 | 14 ------ scripts/docker/Dockerfile-arch-gcc-8-gen-9 | 14 ------ scripts/docker/Dockerfile-arch-ppa-gcc-8 | 11 ----- scripts/docker/Dockerfile-fedora-27-clang-5 | 12 ----- .../docker/Dockerfile-fedora-27-copr-gcc-7 | 17 ------- scripts/docker/Dockerfile-fedora-27-gcc-7 | 12 ----- scripts/docker/Dockerfile-fedora-28-clang-6 | 12 ----- .../docker/Dockerfile-fedora-28-copr-gcc-8 | 17 ------- scripts/docker/Dockerfile-fedora-28-gcc-8 | 12 ----- .../docker/Dockerfile-fedora-29-copr-gcc-8 | 17 ------- ...5 => Dockerfile-ubuntu-16.04-gcc-5-gen-11} | 1 + .../Dockerfile-ubuntu-16.04-gcc-5-gen-12 | 13 ++++++ .../Dockerfile-ubuntu-16.04-gcc-5-gen-8 | 13 ++++++ .../Dockerfile-ubuntu-16.04-gcc-5-gen-9 | 13 ++++++ .../docker/Dockerfile-ubuntu-18.04-clang-4 | 4 +- .../docker/Dockerfile-ubuntu-18.04-clang-5 | 4 +- .../docker/Dockerfile-ubuntu-18.04-clang-6 | 4 +- ...5 => Dockerfile-ubuntu-18.04-gcc-5-gen-11} | 3 +- ...5 => Dockerfile-ubuntu-18.04-gcc-5-gen-12} | 3 +- .../Dockerfile-ubuntu-18.04-gcc-5-gen-8 | 13 ++++++ .../Dockerfile-ubuntu-18.04-gcc-5-gen-9 | 13 ++++++ ...6 => Dockerfile-ubuntu-18.04-gcc-6-gen-11} | 3 +- .../Dockerfile-ubuntu-18.04-gcc-6-gen-12 | 13 ++++++ .../Dockerfile-ubuntu-18.04-gcc-6-gen-8 | 13 ++++++ .../Dockerfile-ubuntu-18.04-gcc-6-gen-9 | 13 ++++++ scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 | 2 +- .../Dockerfile-ubuntu-18.04-gcc-7-gen-11 | 14 ++++++ .../Dockerfile-ubuntu-18.04-gcc-7-gen-12 | 14 ++++++ .../Dockerfile-ubuntu-18.04-gcc-7-gen-8 | 5 +-- .../Dockerfile-ubuntu-18.04-gcc-7-gen-9 | 5 +-- scripts/igc/CMakeLists.txt | 32 -------------- scripts/igc/prepare.sh | 44 ------------------- scripts/prepare-arch-aur-gcc-8.sh | 21 --------- scripts/prepare-arch-clang-6.sh | 14 ------ scripts/prepare-arch-dep-ppa.sh | 32 -------------- scripts/prepare-arch-gcc-5.sh | 17 ------- ...{prepare-arch-gcc-8.sh => prepare-arch.sh} | 0 46 files changed, 191 insertions(+), 397 deletions(-) delete mode 100755 scripts/build-fedora27-copr-docker.sh delete mode 100755 scripts/build-fedora28-copr-docker.sh delete mode 100755 scripts/build-fedora29-copr-docker.sh rename scripts/docker/{Dockerfile-arch-gcc-8 => Dockerfile-arch} (57%) delete mode 100644 scripts/docker/Dockerfile-arch-aur-gcc-8 delete mode 100644 scripts/docker/Dockerfile-arch-clang-6 delete mode 100644 scripts/docker/Dockerfile-arch-gcc-5 delete mode 100644 scripts/docker/Dockerfile-arch-gcc-8-gen-8 delete mode 100644 scripts/docker/Dockerfile-arch-gcc-8-gen-9 delete mode 100644 scripts/docker/Dockerfile-arch-ppa-gcc-8 delete mode 100644 scripts/docker/Dockerfile-fedora-27-clang-5 delete mode 100644 scripts/docker/Dockerfile-fedora-27-copr-gcc-7 delete mode 100644 scripts/docker/Dockerfile-fedora-27-gcc-7 delete mode 100644 scripts/docker/Dockerfile-fedora-28-clang-6 delete mode 100644 scripts/docker/Dockerfile-fedora-28-copr-gcc-8 delete mode 100644 scripts/docker/Dockerfile-fedora-28-gcc-8 delete mode 100644 scripts/docker/Dockerfile-fedora-29-copr-gcc-8 rename scripts/docker/{Dockerfile-ubuntu-16.04-gcc-5 => Dockerfile-ubuntu-16.04-gcc-5-gen-11} (88%) create mode 100644 scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 create mode 100644 scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 create mode 100644 scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 rename scripts/docker/{Dockerfile-ubuntu-18.04-gcc-5 => Dockerfile-ubuntu-18.04-gcc-5-gen-11} (79%) rename scripts/docker/{Dockerfile-ubuntu-18.04-ppa-gcc-5 => Dockerfile-ubuntu-18.04-gcc-5-gen-12} (79%) create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 rename scripts/docker/{Dockerfile-ubuntu-18.04-gcc-6 => Dockerfile-ubuntu-18.04-gcc-6-gen-11} (79%) create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 create mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 delete mode 100644 scripts/igc/CMakeLists.txt delete mode 100755 scripts/igc/prepare.sh delete mode 100755 scripts/prepare-arch-aur-gcc-8.sh delete mode 100755 scripts/prepare-arch-clang-6.sh delete mode 100755 scripts/prepare-arch-dep-ppa.sh delete mode 100755 scripts/prepare-arch-gcc-5.sh rename scripts/{prepare-arch-gcc-8.sh => prepare-arch.sh} (100%) diff --git a/.travis.yml b/.travis.yml index 75aba9c455..fbe19dacde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,16 @@ matrix: include: - os: linux compiler: gcc - env: BUILD_OS=ubuntu-16.04 COMPILER=gcc-5 + env: BUILD_OS=ubuntu-16.04 COMPILER=gcc-5 GEN=gen-8 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-16.04 COMPILER=gcc-5 GEN=gen-9 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-16.04 COMPILER=gcc-5 GEN=gen-11 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-16.04 COMPILER=gcc-5 GEN=gen-12 - os: linux compiler: clang env: BUILD_OS=ubuntu-16.04 COMPILER=clang-4 @@ -38,16 +47,40 @@ matrix: env: BUILD_OS=ubuntu-18.04 COMPILER=clang-8 - os: linux compiler: gcc - env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-5 + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-5 GEN=gen-8 - os: linux compiler: gcc - env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-6 + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-5 GEN=gen-9 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-5 GEN=gen-11 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-5 GEN=gen-12 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-6 GEN=gen-8 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-6 GEN=gen-9 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-6 GEN=gen-11 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-6 GEN=gen-12 - os: linux compiler: gcc env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-7 GEN=gen-8 - os: linux compiler: gcc env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-7 GEN=gen-9 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-7 GEN=gen-11 + - os: linux + compiler: gcc + env: BUILD_OS=ubuntu-18.04 COMPILER=gcc-7 GEN=gen-12 script: ./scripts/run-build.sh diff --git a/scripts/build-arch-docker.sh b/scripts/build-arch-docker.sh index b83c029fe2..9d74413996 100755 --- a/scripts/build-arch-docker.sh +++ b/scripts/build-arch-docker.sh @@ -7,5 +7,5 @@ git fetch -t git clone ../compute-runtime neo -docker build -f scripts/docker/Dockerfile-arch-gcc-8 -t neo-arch-gcc-8:ci . +docker build -f scripts/docker/Dockerfile-arch -t neo-arch:ci . diff --git a/scripts/build-fedora27-copr-docker.sh b/scripts/build-fedora27-copr-docker.sh deleted file mode 100755 index 76c2f5bc4d..0000000000 --- a/scripts/build-fedora27-copr-docker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker info -docker build -f scripts/docker/Dockerfile-fedora-27-copr-gcc-7 -t neo-fedora-27-copr-gcc-7:ci . - diff --git a/scripts/build-fedora28-copr-docker.sh b/scripts/build-fedora28-copr-docker.sh deleted file mode 100755 index c8aed87fe0..0000000000 --- a/scripts/build-fedora28-copr-docker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker info -docker build -f scripts/docker/Dockerfile-fedora-28-copr-gcc-8 -t neo-fedora-28-copr-gcc-8:ci . - diff --git a/scripts/build-fedora29-copr-docker.sh b/scripts/build-fedora29-copr-docker.sh deleted file mode 100755 index 127d9980c3..0000000000 --- a/scripts/build-fedora29-copr-docker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker info -docker build -f scripts/docker/Dockerfile-fedora-29-copr-gcc-8 -t neo-fedora-29-copr-gcc-8:ci . - diff --git a/scripts/docker/Dockerfile-arch-gcc-8 b/scripts/docker/Dockerfile-arch similarity index 57% rename from scripts/docker/Dockerfile-arch-gcc-8 rename to scripts/docker/Dockerfile-arch index a398cc921e..f7b7e80608 100644 --- a/scripts/docker/Dockerfile-arch-gcc-8 +++ b/scripts/docker/Dockerfile-arch @@ -2,10 +2,11 @@ FROM docker.io/archlinux/base MAINTAINER Jacek Danecki COPY neo /root/neo -COPY scripts/prepare-arch-gcc-8.sh /root +COPY scripts/prepare-arch.sh /root -RUN /root/prepare-arch-gcc-8.sh +RUN /root/prepare-arch.sh RUN cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ ../neo ; \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ + -DDO_NOT_RUN_AUB_TESTS=1 ../neo ; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-arch-aur-gcc-8 b/scripts/docker/Dockerfile-arch-aur-gcc-8 deleted file mode 100644 index a30ef42417..0000000000 --- a/scripts/docker/Dockerfile-arch-aur-gcc-8 +++ /dev/null @@ -1,12 +0,0 @@ -FROM docker.io/archlinux/base -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-arch-aur-gcc-8.sh /root -COPY scripts/build-arch-dep.sh /root - -RUN /root/prepare-arch-aur-gcc-8.sh -RUN cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ ../neo ; \ - ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-arch-clang-6 b/scripts/docker/Dockerfile-arch-clang-6 deleted file mode 100644 index 8459174beb..0000000000 --- a/scripts/docker/Dockerfile-arch-clang-6 +++ /dev/null @@ -1,14 +0,0 @@ -FROM docker.io/base/archlinux -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-arch-clang-6.sh /root -COPY scripts/build-arch-dep.sh /root -COPY scripts/prepare-workspace.sh /root - -RUN /root/prepare-arch-clang-6.sh -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-arch-gcc-5 b/scripts/docker/Dockerfile-arch-gcc-5 deleted file mode 100644 index 4a99e5b5d3..0000000000 --- a/scripts/docker/Dockerfile-arch-gcc-5 +++ /dev/null @@ -1,14 +0,0 @@ -FROM docker.io/base/archlinux -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-arch-gcc-5.sh /root -COPY scripts/build-arch-dep.sh /root -COPY scripts/prepare-workspace.sh /root - -RUN /root/prepare-arch-gcc-5.sh -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-arch-gcc-8-gen-8 b/scripts/docker/Dockerfile-arch-gcc-8-gen-8 deleted file mode 100644 index c5a7b0c188..0000000000 --- a/scripts/docker/Dockerfile-arch-gcc-8-gen-8 +++ /dev/null @@ -1,14 +0,0 @@ -FROM docker.io/base/archlinux -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-arch-gcc-8.sh /root -COPY scripts/build-arch-dep.sh /root -COPY scripts/prepare-workspace.sh /root - -RUN /root/prepare-arch-gcc-8.sh -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSUPPORT_GEN9=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-arch-gcc-8-gen-9 b/scripts/docker/Dockerfile-arch-gcc-8-gen-9 deleted file mode 100644 index 3e7d368421..0000000000 --- a/scripts/docker/Dockerfile-arch-gcc-8-gen-9 +++ /dev/null @@ -1,14 +0,0 @@ -FROM docker.io/base/archlinux -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-arch-gcc-8.sh /root -COPY scripts/build-arch-dep.sh /root -COPY scripts/prepare-workspace.sh /root - -RUN /root/prepare-arch-gcc-8.sh -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSUPPORT_GEN8=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-arch-ppa-gcc-8 b/scripts/docker/Dockerfile-arch-ppa-gcc-8 deleted file mode 100644 index 9a31189658..0000000000 --- a/scripts/docker/Dockerfile-arch-ppa-gcc-8 +++ /dev/null @@ -1,11 +0,0 @@ -FROM docker.io/base/archlinux -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-arch-dep-ppa.sh /root - -RUN pacman -Sy --noconfirm gcc cmake git wget pkg-config ninja -RUN /root/prepare-arch-dep-ppa.sh -RUN cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-27-clang-5 b/scripts/docker/Dockerfile-fedora-27-clang-5 deleted file mode 100644 index 75f06c2da6..0000000000 --- a/scripts/docker/Dockerfile-fedora-27-clang-5 +++ /dev/null @@ -1,12 +0,0 @@ -FROM fedora:27 -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN dnf install -y clang make cmake ninja-build git wget pkg-config xz ncurses-compat-libs findutils -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 b/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 deleted file mode 100644 index 59e1f4f903..0000000000 --- a/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 +++ /dev/null @@ -1,17 +0,0 @@ -FROM fedora:27 -MAINTAINER Jacek Danecki - -COPY neo /root/neo - -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ - dnf install -y 'dnf-command(copr)'; \ - dnf copr enable -y arturh/intel-opencl-staging; \ - dnf copr enable -y arturh/intel-opencl-experimental; \ - dnf copr enable -y arturh/intel-opencl-unstable; \ - dnf copr enable -y arturh/intel-opencl; \ - dnf --showduplicate list intel-igc-opencl-devel; \ - dnf install -y intel-igc-opencl-devel; \ - cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib; \ - mkdir /root/build; cd /root/build ; cmake -G Ninja ../neo; \ - ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-27-gcc-7 b/scripts/docker/Dockerfile-fedora-27-gcc-7 deleted file mode 100644 index 4c7f473033..0000000000 --- a/scripts/docker/Dockerfile-fedora-27-gcc-7 +++ /dev/null @@ -1,12 +0,0 @@ -FROM fedora:27 -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN dnf install -y gcc-c++ make cmake ninja-build git wget pkg-config xz ncurses-compat-libs findutils -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-28-clang-6 b/scripts/docker/Dockerfile-fedora-28-clang-6 deleted file mode 100644 index f400fa08c4..0000000000 --- a/scripts/docker/Dockerfile-fedora-28-clang-6 +++ /dev/null @@ -1,12 +0,0 @@ -FROM fedora:28 -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN dnf install -y clang make cmake ninja-build git wget pkg-config xz ncurses-compat-libs findutils -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 b/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 deleted file mode 100644 index d2f49424cf..0000000000 --- a/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 +++ /dev/null @@ -1,17 +0,0 @@ -FROM fedora:28 -MAINTAINER Jacek Danecki - -COPY neo /root/neo - -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ - dnf install -y 'dnf-command(copr)'; \ - dnf copr enable -y arturh/intel-opencl-staging; \ - dnf copr enable -y arturh/intel-opencl-experimental; \ - dnf copr enable -y arturh/intel-opencl-unstable; \ - dnf copr enable -y arturh/intel-opencl; \ - dnf --showduplicate list intel-igc-opencl-devel intel-gmmlib-devel; \ - dnf install -y intel-igc-opencl-devel intel-gmmlib-devel; \ - mkdir /root/build; cd /root/build ; cmake -G Ninja \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo; \ - ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-28-gcc-8 b/scripts/docker/Dockerfile-fedora-28-gcc-8 deleted file mode 100644 index 295c7862a5..0000000000 --- a/scripts/docker/Dockerfile-fedora-28-gcc-8 +++ /dev/null @@ -1,12 +0,0 @@ -FROM fedora:28 -MAINTAINER Jacek Danecki - -COPY neo /root/neo -COPY scripts/prepare-workspace.sh /root - -RUN dnf install -y gcc-c++ make cmake ninja-build git wget pkg-config xz ncurses-compat-libs findutils -RUN /root/prepare-workspace.sh -RUN cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-29-copr-gcc-8 b/scripts/docker/Dockerfile-fedora-29-copr-gcc-8 deleted file mode 100644 index d441d856cd..0000000000 --- a/scripts/docker/Dockerfile-fedora-29-copr-gcc-8 +++ /dev/null @@ -1,17 +0,0 @@ -FROM fedora:29 -MAINTAINER Jacek Danecki - -COPY neo /root/neo - -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ - dnf install -y 'dnf-command(copr)'; \ - dnf copr enable -y arturh/intel-opencl-staging; \ - dnf copr enable -y arturh/intel-opencl-experimental; \ - dnf copr enable -y arturh/intel-opencl-unstable; \ - dnf copr enable -y arturh/intel-opencl; \ - dnf --showduplicate list intel-igc-opencl-devel intel-gmmlib-devel; \ - dnf install -y intel-igc-opencl-devel intel-gmmlib-devel; \ - mkdir /root/build; cd /root/build ; cmake -G Ninja \ - -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-gen-11 similarity index 88% rename from scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 rename to scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 index 90cc398a1b..385a8138be 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 @@ -7,6 +7,7 @@ RUN echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu xenial main" apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../neo; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 new file mode 100644 index 0000000000..6281df6a82 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:16.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo + +RUN echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ + -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../neo; \ + ninja -j `nproc` +CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 new file mode 100644 index 0000000000..6156854384 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:16.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo + +RUN echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../neo; \ + ninja -j `nproc` +CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 new file mode 100644 index 0000000000..f8c7bae1be --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:16.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo + +RUN echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../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 494062878d..592c887aa0 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 @@ -7,7 +7,7 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-4.0 -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -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` + ../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 298ff4f9a2..b3b66064f6 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 @@ -7,7 +7,7 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-5.0 -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -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` + ../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 892121c74c..1347a64b3c 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 @@ -7,7 +7,7 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-6.0 -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -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` + ../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-gen-11 similarity index 79% rename from scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 rename to scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 index f125338682..4bd60a905f 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 @@ -6,7 +6,8 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../neo; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 similarity index 79% rename from scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 rename to scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 index f125338682..23894302a7 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 @@ -6,7 +6,8 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../neo; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 new file mode 100644 index 0000000000..fdb46f6737 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../neo; \ + ninja -j `nproc` +CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 new file mode 100644 index 0000000000..f26eaea960 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ../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-gen-11 similarity index 79% rename from scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 rename to scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 index a5b07b57aa..484c295355 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 @@ -6,7 +6,8 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ -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-6-gen-12 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 new file mode 100644 index 0000000000..68f9f77f12 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ + -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-6-gen-8 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 new file mode 100644 index 0000000000..e3b767ac83 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -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-6-gen-9 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 new file mode 100644 index 0000000000..37cc1c3af9 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 @@ -0,0 +1,13 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -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 9fd34c2ac1..8320a1efd0 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 @@ -7,7 +7,7 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ 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 \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -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/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 new file mode 100644 index 0000000000..3e45cfa6e5 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 @@ -0,0 +1,14 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ + ../neo; \ + ninja -j `nproc` +CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 new file mode 100644 index 0000000000..e5149895f0 --- /dev/null +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 @@ -0,0 +1,14 @@ +FROM docker.io/ubuntu:18.04 +MAINTAINER Jacek Danecki + +COPY neo /root/neo +RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ + echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ + ../neo; \ + ninja -j `nproc` +CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 index debccac52d..992cb1475a 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 @@ -6,10 +6,9 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 \ - -DSUPPORT_GEN9=0 \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 \ + -DSUPPORT_GEN8=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ ../neo; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 index 3ae8530dfe..cfe55b878c 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 @@ -6,10 +6,9 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release \ +RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 \ - -DSUPPORT_GEN8=0 \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ ../neo; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/igc/CMakeLists.txt b/scripts/igc/CMakeLists.txt deleted file mode 100644 index a6510f41f6..0000000000 --- a/scripts/igc/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (C) 2017-2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -project(IntelGraphicsCompiler) - -set(IGC_LIBRARY_NAME "igc") -set(IGC_LIBRARY_NAME "${IGC_LIBRARY_NAME}" PARENT_SCOPE) -set(FCL_LIBRARY_NAME "igdfcl") -set(FCL_LIBRARY_NAME "${FCL_LIBRARY_NAME}" PARENT_SCOPE) - -add_library(igc SHARED IMPORTED GLOBAL) -set_property(TARGET igc PROPERTY "IMPORTED_LOCATION" "${CMAKE_CURRENT_SOURCE_DIR}/lib/lib${IGC_LIBRARY_NAME}.so") -set_property(TARGET igc PROPERTY "INTERFACE_INCLUDE_DIRECTORIES" "${CMAKE_CURRENT_SOURCE_DIR}/inc/") - -add_library(opencl_clang SHARED IMPORTED GLOBAL) -set_property(TARGET opencl_clang PROPERTY "IMPORTED_LOCATION" "${CMAKE_CURRENT_SOURCE_DIR}/lib/libopencl_clang.so") - -add_library(iga SHARED IMPORTED GLOBAL) -set_property(TARGET iga PROPERTY "IMPORTED_LOCATION" "${CMAKE_CURRENT_SOURCE_DIR}/lib/libiga64.so") - -add_library(fcl SHARED IMPORTED GLOBAL) -set_property(TARGET fcl PROPERTY "IMPORTED_LOCATION" "${CMAKE_CURRENT_SOURCE_DIR}/lib/lib${FCL_LIBRARY_NAME}.so") - -list(APPEND IGC__IGC_TARGETS "igc") -list(APPEND IGC__IGC_TARGETS "iga") -list(APPEND IGC__IGC_TARGETS "fcl") -list(APPEND IGC__IGC_TARGETS "opencl_clang") - -set(IGC__IGC_TARGETS "${IGC__IGC_TARGETS}" PARENT_SCOPE) diff --git a/scripts/igc/prepare.sh b/scripts/igc/prepare.sh deleted file mode 100755 index 20fd62362f..0000000000 --- a/scripts/igc/prepare.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git tag -l - -VER=`git describe --tags --abbrev=0` -IGC_INFO=($(git show ${VER}:../../manifests/manifest.yml | grep -U -A 1 intelgraphicscompiler )) -IGC_REV=${IGC_INFO[3]} - -echo "NEO release: ${VER}" -echo "IGC_REV: ${IGC_REV}" - -NEO_TOP_DIR=`git rev-parse --show-toplevel` -WRK_DIR=${NEO_TOP_DIR}/.. -mkdir -p ${WRK_DIR}/igc/inc -cp CMakeLists.txt ${WRK_DIR}/igc -pushd ${WRK_DIR}/igc - -wget https://github.com/intel/compute-runtime/releases/download/${VER}/intel-opencl_${VER}_amd64.deb -ar -x intel-opencl_${VER}_amd64.deb -tar -xJf data.tar.xz -find . -name libigdrcl.so -exec rm {} \; -LIB_PATH=`find . -name libigc.so` -echo "libraries found in ${LIB_PATH}" -ln -sv `dirname ${LIB_PATH}` lib - -git clone https://github.com/intel/intel-graphics-compiler igc -pushd igc; git checkout ${IGC_REV}; popd - -pushd inc -ln -s ../igc/IGC/AdaptorOCL/cif/cif cif -ln -s ../igc/IGC/AdaptorOCL/ocl_igc_interface ocl_igc_interface -ln -s ../igc/IGC/AdaptorOCL/ocl_igc_shared/device_enqueue/DeviceEnqueueInternalTypes.h DeviceEnqueueInternalTypes.h -ln -s ../igc/IGC/AdaptorOCL/ocl_igc_shared/executable_format/patch_g7.h patch_g7.h -ln -s ../igc/IGC/AdaptorOCL/ocl_igc_shared/executable_format/patch_list.h patch_list.h -ln -s ../igc/IGC/AdaptorOCL/ocl_igc_shared/executable_format/patch_shared.h patch_shared.h -ln -s ../igc/IGC/AdaptorOCL/ocl_igc_shared/executable_format/program_debug_data.h program_debug_data.h -popd - -popd diff --git a/scripts/prepare-arch-aur-gcc-8.sh b/scripts/prepare-arch-aur-gcc-8.sh deleted file mode 100755 index d2609a6615..0000000000 --- a/scripts/prepare-arch-aur-gcc-8.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018-2019 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -set -e -set -x - -pacman -Sy --noconfirm gcc cmake git make wget pkg-config fakeroot ninja sudo \ - perl-io-string perl-test-pod autoconf automake patch llvm clang \ - intel-gmmlib nettle gnutls p7zip python-nose python2 bison flex - -useradd -m build -g wheel -sed -i "s/^# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers -cp -a /root/*.sh /home/build -su -l build /home/build/build-arch-dep.sh - -mkdir /root/build - diff --git a/scripts/prepare-arch-clang-6.sh b/scripts/prepare-arch-clang-6.sh deleted file mode 100755 index 88cdb0d186..0000000000 --- a/scripts/prepare-arch-clang-6.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -pacman -Sy --noconfirm clang cmake git make wget pkg-config fakeroot ninja sudo \ - perl-io-string perl-test-pod autoconf automake patch -useradd -m build -g wheel -sed -i "s/^# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers -cp -a /root/*.sh /home/build -su -l build /home/build/build-arch-dep.sh - diff --git a/scripts/prepare-arch-dep-ppa.sh b/scripts/prepare-arch-dep-ppa.sh deleted file mode 100755 index b99b1fd748..0000000000 --- a/scripts/prepare-arch-dep-ppa.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -cd /root -IGC_VER="`grep igc_version_required neo/scripts/fedora.spec.in | grep global | awk '{print $3}'`-1" -GMM_VER="`grep gmmlib_version_required neo/scripts/fedora.spec.in | grep global | awk '{print $3}'`-1" - -echo "IGC_VER=${IGC_VER}" -echo "GMM_VER=${GMM_VER}" - -install_libs() { - wget https://launchpad.net/~ocl-dev/+archive/ubuntu/intel-opencl/+files/$1 - ar -x $1 - tar -xJf data.tar.xz - rm -f data.tar.xz $1 -} - -install_libs intel-opencl-clang_4.0.16-1~ppa1~bionic1_amd64.deb -install_libs intel-igc-core_${IGC_VER}~ppa1~bionic1_amd64.deb -install_libs intel-igc-opencl-dev_${IGC_VER}~ppa1~bionic1_amd64.deb -install_libs intel-igc-opencl_${IGC_VER}~ppa1~bionic1_amd64.deb -install_libs intel-gmmlib_${GMM_VER}~ppa1~bionic1_amd64.deb -install_libs intel-gmmlib-dev_${GMM_VER}~ppa1~bionic1_amd64.deb - -cp -ar usr / -ln -sf /usr/lib/x86_64-linux-gnu/*.so* /usr/lib64 -ln -s /usr/lib/x86_64-linux-gnu/pkgconfig/*.pc /usr/lib64/pkgconfig -mkdir /root/build diff --git a/scripts/prepare-arch-gcc-5.sh b/scripts/prepare-arch-gcc-5.sh deleted file mode 100755 index 254c3b8c99..0000000000 --- a/scripts/prepare-arch-gcc-5.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -pacman -Sy --noconfirm gcc54 cmake git make wget pkg-config fakeroot ninja sudo \ - perl-io-string perl-test-pod autoconf automake patch -ln -s /usr/bin/gcc-5 /usr/bin/gcc -ln -s /usr/bin/g++-5 /usr/bin/g++ -useradd -m build -g wheel -sed -i "s/^# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers -sed -i "s/ -fno-plt//g" /etc/makepkg.conf -cp -a /root/*.sh /home/build -su -l build /home/build/build-arch-dep.sh - diff --git a/scripts/prepare-arch-gcc-8.sh b/scripts/prepare-arch.sh similarity index 100% rename from scripts/prepare-arch-gcc-8.sh rename to scripts/prepare-arch.sh