From 97b215440aee3a8a9fc29306dc759bddfdd34536 Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Tue, 31 Jul 2018 16:36:11 +0200 Subject: [PATCH] ci: switch to intel-opencl ppa This ppa is available at: https://launchpad.net/~intel-opencl/+archive/ubuntu/intel-opencl Signed-off-by: Jacek Danecki https://github.com/intel/compute-runtime/pull/72 Change-Id: I8ab4f8881d882f399386e875125c20542d5b72ab --- scripts/docker/Dockerfile-ubuntu-16.04-clang-4 | 4 ++-- scripts/docker/Dockerfile-ubuntu-16.04-clang-5 | 4 ++-- scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 | 4 ++-- scripts/docker/Dockerfile-ubuntu-18.04-clang-4 | 4 ++-- scripts/docker/Dockerfile-ubuntu-18.04-clang-5 | 4 ++-- scripts/docker/Dockerfile-ubuntu-18.04-clang-6 | 4 ++-- scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 | 4 ++-- scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 | 4 ++-- scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 | 4 ++-- scripts/install-deps.sh | 4 ++-- scripts/prepare-arch-igc-ppa.sh | 10 ++++++---- 11 files changed, 26 insertions(+), 24 deletions(-) diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 b/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 index 614393f76f..03ac957700 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-clang-4 @@ -3,8 +3,8 @@ MAINTAINER Jacek Danecki COPY neo /root/neo -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; \ +RUN echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 b/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 index d17313c2a7..d10429da42 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-clang-5 @@ -3,8 +3,8 @@ MAINTAINER Jacek Danecki COPY neo /root/neo -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; \ +RUN echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 b/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 index 083572d24c..88b627975e 100644 --- a/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 +++ b/scripts/docker/Dockerfile-ubuntu-16.04-ppa-gcc-5 @@ -3,8 +3,8 @@ MAINTAINER Jacek Danecki COPY neo /root/neo -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; \ +RUN echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 index 6b23a72097..e9f2cb5a4c 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-4 @@ -4,8 +4,8 @@ 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/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 index d5fb963d19..ad2ff008b0 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-5 @@ -4,8 +4,8 @@ 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/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 index ded121848c..59ed2df05d 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-6 @@ -4,8 +4,8 @@ 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/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 index 50e2b1edd5..dc29fdb2e7 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-6 @@ -3,8 +3,8 @@ 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/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 index 4630447d0d..2ec6307ef6 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 @@ -3,8 +3,8 @@ 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/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ 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 \ diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 b/scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 index 886e854175..33fbff3d83 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-ppa-gcc-5 @@ -3,8 +3,8 @@ 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/jdanecki/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7B77841DF9C7FE04; \ + echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F; \ apt-get -y update ; apt-get install -y --allow-unauthenticated cmake g++-5 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 \ diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index f267989a39..afd8551b10 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -26,8 +26,8 @@ wait_apt() { sleep 5 done } -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 +echo "deb http://ppa.launchpad.net/intel-opencl/intel-opencl/ubuntu xenial main" >> /etc/apt/sources.list +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9732172C4830B8F apt-get -y update if [ $? -ne 0 ] diff --git a/scripts/prepare-arch-igc-ppa.sh b/scripts/prepare-arch-igc-ppa.sh index 854703cdab..4121f9da01 100755 --- a/scripts/prepare-arch-igc-ppa.sh +++ b/scripts/prepare-arch-igc-ppa.sh @@ -19,20 +19,22 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. +IGC_VER=18.30.707-2 + cd /root mkdir /root/igc install_libs() { - wget https://launchpad.net/~jdanecki/+archive/ubuntu/intel-opencl/+files/$1 + wget https://launchpad.net/~intel-opencl/+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.15-1~ppa1~bionic1_amd64.deb -install_libs intel-igc-core_18.30.707-2~ppa1~bionic1_amd64.deb -install_libs intel-igc-opencl-dev_18.30.707-2~ppa1~bionic1_amd64.deb -install_libs intel-igc-opencl_18.30.707-2~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 cp -ar usr / ln -sf /usr/lib/x86_64-linux-gnu/*.so /usr/lib64