From 4c3dd2cdbe27a4c6a48feeea5488e0216e3322c6 Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Wed, 13 Nov 2019 11:38:02 +0100 Subject: [PATCH] ci: use new igc packages from ~ocl-dev ppa Remove obsoleted scripts Signed-off-by: Jacek Danecki https://github.com/intel/compute-runtime/pull/234 Change-Id: I244214a3fa778e3e048566c5869f8348563a752a --- scripts/build-arch-aur-docker.sh | 11 ----------- scripts/build-ubuntu-16.4-docker.sh | 11 ----------- scripts/build-ubuntu-16.4-ppa-docker.sh | 11 ----------- scripts/build-ubuntu-18.4-docker.sh | 11 ----------- scripts/build-ubuntu-18.4-ppa-docker.sh | 11 ----------- scripts/docker/Dockerfile-ubuntu-16.04-clang-4 | 2 +- scripts/docker/Dockerfile-ubuntu-16.04-clang-5 | 2 +- scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 | 2 +- scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 | 2 +- scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 | 2 +- scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 | 2 +- scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 | 12 ------------ scripts/docker/Dockerfile-ubuntu-18.04-clang-4 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-clang-5 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-clang-6 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-clang-7 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-clang-8 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 | 13 ------------- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 | 2 +- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 | 2 +- scripts/install-deps.sh | 6 +++--- 31 files changed, 26 insertions(+), 106 deletions(-) delete mode 100755 scripts/build-arch-aur-docker.sh delete mode 100755 scripts/build-ubuntu-16.4-docker.sh delete mode 100755 scripts/build-ubuntu-16.4-ppa-docker.sh delete mode 100755 scripts/build-ubuntu-18.4-docker.sh delete mode 100755 scripts/build-ubuntu-18.4-ppa-docker.sh delete mode 100644 scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 delete mode 100644 scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 diff --git a/scripts/build-arch-aur-docker.sh b/scripts/build-arch-aur-docker.sh deleted file mode 100755 index ce42827e88..0000000000 --- a/scripts/build-arch-aur-docker.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018-2019 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker build -f scripts/docker/Dockerfile-arch-aur-gcc-8 -t neo-arch-aur-gcc-8:ci . - diff --git a/scripts/build-ubuntu-16.4-docker.sh b/scripts/build-ubuntu-16.4-docker.sh deleted file mode 100755 index e3d7661c88..0000000000 --- a/scripts/build-ubuntu-16.4-docker.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker build -f scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 -t neo-ubuntu-16.04-gcc-5:ci . - diff --git a/scripts/build-ubuntu-16.4-ppa-docker.sh b/scripts/build-ubuntu-16.4-ppa-docker.sh deleted file mode 100755 index e983706f30..0000000000 --- a/scripts/build-ubuntu-16.4-ppa-docker.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker build -f scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 -t neo-ubuntu-16.04-ppa-gcc-5:ci . - diff --git a/scripts/build-ubuntu-18.4-docker.sh b/scripts/build-ubuntu-18.4-docker.sh deleted file mode 100755 index ce7f3c9fbe..0000000000 --- a/scripts/build-ubuntu-18.4-docker.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker build -f scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 -t neo-ubuntu-18.4-gcc-7:ci . - diff --git a/scripts/build-ubuntu-18.4-ppa-docker.sh b/scripts/build-ubuntu-18.4-ppa-docker.sh deleted file mode 100755 index 3b06c2952c..0000000000 --- a/scripts/build-ubuntu-18.4-ppa-docker.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2018 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker build -f scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 -t neo-ubuntu-18.04-ppa-gcc-5:ci . - diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 b/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 index 7b628e4f10..05ffebb7f9 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 @@ -5,7 +5,7 @@ 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 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-4.0 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-4.0 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` diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 b/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 index 5a75e91de3..fbb8f8e175 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 @@ -5,7 +5,7 @@ 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 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-5.0 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-5.0 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` diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 index 385a8138be..13a6c661b1 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-11 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 index 6281df6a82..bffbdbe3f0 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-12 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 index 6156854384..074799b929 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-8 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 index f8c7bae1be..13ca873924 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-gcc-5-gen-9 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 b/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 deleted file mode 100644 index 3198ebc6ab..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 +++ /dev/null @@ -1,12 +0,0 @@ -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 \ - -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DSKIP_UNIT_TESTS=1 ../neo; \ - ninja -j 2 -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 index 592c887aa0..147438ef55 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 @@ -6,7 +6,7 @@ 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 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-4.0 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-4.0 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 \ ../neo ; ninja -j `nproc` diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 index b3b66064f6..cbc1da3450 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 @@ -6,7 +6,7 @@ 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 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-5.0 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-5.0 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 \ ../neo ; ninja -j `nproc` diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 index 1347a64b3c..a0f41ef7e7 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 @@ -6,7 +6,7 @@ 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 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-6.0 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-6.0 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 \ ../neo ; ninja -j `nproc` diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-7 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-7 index a191045eba..b1c7287cff 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-7 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-7 @@ -6,7 +6,7 @@ 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 git pkg-config ninja-build intel-igc-opencl-dev intel-gmmlib-dev clang-7 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-7 RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-8 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-8 index e22740b458..80079c7de2 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-8 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-8 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg wget; \ echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list; \ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - ; \ 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-8 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake git pkg-config ninja-build libigc-dev intel-gmmlib-dev clang-8 RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc` diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 index 4bd60a905f..3d449edfd6 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-11 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 index 23894302a7..7b87a8e819 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-12 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 index fdb46f6737..ce2f910503 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-8 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 index f26eaea960..44d2b226ed 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-5-gen-9 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 index 484c295355..d486272c43 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-11 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build libigc-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-6 -DCMAKE_CXX_COMPILER=g++-6 ../neo; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 index 68f9f77f12..f7bb9bb4ee 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-12 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 index e3b767ac83..f1b8aab14d 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-8 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 index 37cc1c3af9..40aa820487 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6-gen-9 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-6 git pkg-config ninja-build libigc-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; \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 deleted file mode 100644 index 8320a1efd0..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 +++ /dev/null @@ -1,13 +0,0 @@ -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 -RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib -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 index 3e45cfa6e5..7fdb285d81 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-11 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build libigc-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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 index e5149895f0..e959894cd3 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-12 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build libigc-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 \ 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 992cb1475a..06f88cffa1 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-8 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build libigc-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=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ 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 cfe55b878c..b675b33dd7 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7-gen-9 @@ -5,7 +5,7 @@ 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 + apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-7 git pkg-config ninja-build libigc-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=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index 4262904157..f887979f35 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2018 Intel Corporation +# Copyright (C) 2018-2019 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -22,11 +22,11 @@ then apt-get -y update fi -apt-get install -y --allow-unauthenticated cmake ninja-build intel-igc-opencl-dev intel-gmmlib-dev +apt-get install -y --allow-unauthenticated cmake ninja-build libigc-dev intel-gmmlib-dev if [ $? -ne 0 ] then wait_apt - apt-get install -y --allow-unauthenticated cmake ninja-build intel-igc-opencl-dev intel-gmmlib-dev + apt-get install -y --allow-unauthenticated cmake ninja-build libigc-dev intel-gmmlib-dev fi dpkg -r ccache