From a21e43b3ae7a44f379d2a6489935c69eed7f5f7d Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Mon, 24 Aug 2020 17:22:13 +0200 Subject: [PATCH] stop building on Ubuntu 19.10 Ubuntu 19.10 is EOL Change-Id: I325d484593e411bb560976875f8bf5c02573b52e Signed-off-by: Jacek Danecki --- .travis.yml | 15 --------------- README.md | 4 ++-- level_zero/doc/DISTRIBUTIONS.md | 2 +- opencl/doc/DISTRIBUTIONS.md | 4 ++-- scripts/docker/Dockerfile-ubuntu-19.10-clang | 14 -------------- scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-11 | 15 --------------- scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-12 | 15 --------------- scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-8 | 15 --------------- scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-9 | 15 --------------- 9 files changed, 5 insertions(+), 94 deletions(-) delete mode 100644 scripts/docker/Dockerfile-ubuntu-19.10-clang delete mode 100644 scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-11 delete mode 100644 scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-12 delete mode 100644 scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-8 delete mode 100644 scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-9 diff --git a/.travis.yml b/.travis.yml index 05b21c973a..487383f7d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,21 +27,6 @@ matrix: - os: linux compiler: gcc env: BUILD_OS=ubuntu-18.04 COMPILER=gcc GEN=gen-12 - - os: linux - compiler: clang - env: BUILD_OS=ubuntu-19.10 COMPILER=clang - - os: linux - compiler: gcc - env: BUILD_OS=ubuntu-19.10 COMPILER=gcc GEN=gen-8 - - os: linux - compiler: gcc - env: BUILD_OS=ubuntu-19.10 COMPILER=gcc GEN=gen-9 - - os: linux - compiler: gcc - env: BUILD_OS=ubuntu-19.10 COMPILER=gcc GEN=gen-11 - - os: linux - compiler: gcc - env: BUILD_OS=ubuntu-19.10 COMPILER=gcc GEN=gen-12 - os: linux compiler: clang env: BUILD_OS=ubuntu-20.04 COMPILER=clang diff --git a/README.md b/README.md index 2016d04d6a..2f9e16173a 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ To allow NEO access to GPU device make sure user has permissions to files /dev/d NEO is available for installation on a variety of Linux distributions and can be installed via the distro's package manager. -For example on Ubuntu* 19.04, 19.10: +For example on Ubuntu* 20.04: ``` apt-get install intel-opencl-icd @@ -108,4 +108,4 @@ for more details. * [Interoperability with VTune](https://github.com/intel/compute-runtime/blob/master/opencl/doc/VTUNE.md) * [OpenCL Conformance Tests](https://github.com/KhronosGroup/OpenCL-CTS/) -___(*) Other names and brands may be claimed as property of others.___ \ No newline at end of file +___(*) Other names and brands may be claimed as property of others.___ diff --git a/level_zero/doc/DISTRIBUTIONS.md b/level_zero/doc/DISTRIBUTIONS.md index 89b6520bd8..08df01e92a 100644 --- a/level_zero/doc/DISTRIBUTIONS.md +++ b/level_zero/doc/DISTRIBUTIONS.md @@ -37,7 +37,7 @@ zypper addrepo -r https://copr.fedorainfracloud.org/coprs/jdanecki/intel-opencl/ zypper install level-zero intel-level-zero-gpu ``` -## Ubuntu* ppa for 18.04, 19.10, 20.04 +## Ubuntu* ppa for 18.04, 20.04 ``` add-apt-repository ppa:intel-opencl/intel-opencl diff --git a/opencl/doc/DISTRIBUTIONS.md b/opencl/doc/DISTRIBUTIONS.md index 11a7b658b1..05cabf09f4 100644 --- a/opencl/doc/DISTRIBUTIONS.md +++ b/opencl/doc/DISTRIBUTIONS.md @@ -77,7 +77,7 @@ zypper install intel-opencl ipoldek install intel-gmmlib intel-graphics-compiler intel-compute-runtime ``` -## Ubuntu* ppa for 18.04, 19.10, 20.04 +## Ubuntu* ppa for 18.04, 20.04 ``` add-apt-repository ppa:intel-opencl/intel-opencl @@ -85,7 +85,7 @@ apt update apt install intel-opencl-icd ``` -## Ubuntu* 19.10, 20.04 +## Ubuntu* 20.04 ``` apt install intel-opencl-icd diff --git a/scripts/docker/Dockerfile-ubuntu-19.10-clang b/scripts/docker/Dockerfile-ubuntu-19.10-clang deleted file mode 100644 index d1568a9372..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-19.10-clang +++ /dev/null @@ -1,14 +0,0 @@ -FROM docker.io/ubuntu:19.10 -LABEL maintainer="jacek.danecki@intel.com" - -COPY neo /root/neo - -RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated gpg dirmngr gpg-agent; \ - echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu eoan main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ - apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated cmake pkg-config \ - ninja-build libigc-dev intel-gmmlib-dev clang libze-loader-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ - -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 -DBUILD_WITH_L0=1 ../neo ; ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-11 b/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-11 deleted file mode 100644 index e4a57d2b17..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-11 +++ /dev/null @@ -1,15 +0,0 @@ -FROM docker.io/ubuntu:19.10 -LABEL maintainer="jacek.danecki@intel.com" - -COPY neo /root/neo -RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated gpg dirmngr gpg-agent; \ - echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu eoan main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ - apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated cmake g++ pkg-config \ - ninja-build libigc-dev intel-gmmlib-dev libze-loader-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ - -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ - -DBUILD_WITH_L0=1 ../neo; \ - ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-12 b/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-12 deleted file mode 100644 index 03354b32fa..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-12 +++ /dev/null @@ -1,15 +0,0 @@ -FROM docker.io/ubuntu:19.10 -LABEL maintainer="jacek.danecki@intel.com" - -COPY neo /root/neo -RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated gpg dirmngr gpg-agent; \ - echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu eoan main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ - apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated cmake g++ pkg-config \ - ninja-build libigc-dev intel-gmmlib-dev libze-loader-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ - -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ - -DBUILD_WITH_L0=1 ../neo; \ - ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-8 b/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-8 deleted file mode 100644 index abeabfb911..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-8 +++ /dev/null @@ -1,15 +0,0 @@ -FROM docker.io/ubuntu:19.10 -LABEL maintainer="jacek.danecki@intel.com" - -COPY neo /root/neo -RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated gpg dirmngr gpg-agent; \ - echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu eoan main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ - apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated cmake g++ 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 -DCMAKE_CXX_COMPILER=g++ \ - -DSUPPORT_GEN8=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ - -DBUILD_WITH_L0=0 ../neo; \ - ninja -j `nproc` -CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-9 b/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-9 deleted file mode 100644 index 11a661b8ee..0000000000 --- a/scripts/docker/Dockerfile-ubuntu-19.10-gcc-gen-9 +++ /dev/null @@ -1,15 +0,0 @@ -FROM docker.io/ubuntu:19.10 -LABEL maintainer="jacek.danecki@intel.com" - -COPY neo /root/neo -RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated gpg dirmngr gpg-agent; \ - echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu eoan main" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \ - apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated cmake g++ pkg-config \ - ninja-build libigc-dev intel-gmmlib-dev libze-loader-dev -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ - -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ - -DBUILD_WITH_L0=1 ../neo; \ - ninja -j `nproc` -CMD ["/bin/bash"]