From b14639fa050b300dfb28411ebc8ecbdedddbadd2 Mon Sep 17 00:00:00 2001 From: Dick Carter Date: Thu, 11 Nov 2021 20:42:11 -0800 Subject: [PATCH 1/4] Baseline commit to trigger CI --- ci/docker/Dockerfile.build.ubuntu | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu index f8963d3758be..8b3c70044ca1 100644 --- a/ci/docker/Dockerfile.build.ubuntu +++ b/ci/docker/Dockerfile.build.ubuntu @@ -33,6 +33,9 @@ FROM $BASE_IMAGE AS base WORKDIR /work/deps +# Trigger CI with no functional change: explore baseline CI behavior +# prior to a fix for the oneapi "hash mismatch" problem + SHELL ["/bin/bash", "-c"] RUN export DEBIAN_FRONTEND=noninteractive && \ export OS_RELEASE="$(cat /etc/os-release)" && \ From a0b0b5386bac216836ee99bd9493e0f969d50725 Mon Sep 17 00:00:00 2001 From: Dick Carter Date: Fri, 12 Nov 2021 00:07:30 -0800 Subject: [PATCH 2/4] Remove intel repo after oneapi install --- ci/docker/Dockerfile.build.ubuntu | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu index 8b3c70044ca1..837164a23eee 100644 --- a/ci/docker/Dockerfile.build.ubuntu +++ b/ci/docker/Dockerfile.build.ubuntu @@ -33,9 +33,6 @@ FROM $BASE_IMAGE AS base WORKDIR /work/deps -# Trigger CI with no functional change: explore baseline CI behavior -# prior to a fix for the oneapi "hash mismatch" problem - SHELL ["/bin/bash", "-c"] RUN export DEBIAN_FRONTEND=noninteractive && \ export OS_RELEASE="$(cat /etc/os-release)" && \ @@ -94,7 +91,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libb2-dev \ libzstd-dev \ gfortran && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + add-apt-repository -r "deb https://apt.repos.intel.com/oneapi all main" # Build OpenBLAS from source RUN export LIBRARY_PATH=$LIBRARY_PATH:/usr/lib/gcc/x86_64-linux-gnu/7/ && \ From 88de6b7f192284543c6d6a272697316392b240b4 Mon Sep 17 00:00:00 2001 From: Dick Carter Date: Sun, 14 Nov 2021 13:10:45 -0800 Subject: [PATCH 3/4] Add debug output to oneapi install --- ci/docker/Dockerfile.build.ubuntu | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu index 837164a23eee..be08af00c918 100644 --- a/ci/docker/Dockerfile.build.ubuntu +++ b/ci/docker/Dockerfile.build.ubuntu @@ -36,6 +36,7 @@ WORKDIR /work/deps SHELL ["/bin/bash", "-c"] RUN export DEBIAN_FRONTEND=noninteractive && \ export OS_RELEASE="$(cat /etc/os-release)" && \ + ls -lt /var/*/apt/*/* && \ apt-get clean && \ apt-get update && \ apt-get install -y wget software-properties-common && \ @@ -64,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++ \ g++-7 \ g++-8 \ - intel-oneapi-mkl${INTEL_MKL} \ - intel-oneapi-mkl-devel${INTEL_MKL} \ libomp-dev \ ## Dependencies libgomp1 \ @@ -91,7 +90,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libb2-dev \ libzstd-dev \ gfortran && \ + echo "**** Before oneapi install ****" && \ + ls -lt /var/*/apt/*/* && \ + apt-get install -y \ + intel-oneapi-mkl${INTEL_MKL} \ + intel-oneapi-mkl-devel${INTEL_MKL} && \ + echo "**** After oneapi install ****" && \ + ls -lt /var/*/apt/*/* && \ rm -rf /var/lib/apt/lists/* && \ + echo "**** After apt lists clean ****" && \ + ls -lt /var/*/apt/*/* && \ add-apt-repository -r "deb https://apt.repos.intel.com/oneapi all main" # Build OpenBLAS from source From 705e3d87564a11308ec37c7d0ce07244e14f409c Mon Sep 17 00:00:00 2001 From: Dick Carter Date: Mon, 15 Nov 2021 03:24:10 -0800 Subject: [PATCH 4/4] Add hash info to debug output --- ci/docker/Dockerfile.build.ubuntu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu index be08af00c918..ce9f24604a5e 100644 --- a/ci/docker/Dockerfile.build.ubuntu +++ b/ci/docker/Dockerfile.build.ubuntu @@ -43,7 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ wget -qO - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O - | apt-key add -; \ add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"; \ INTEL_MKL="-2021.3.0"; \ - apt-get update && \ + apt-get -o Debug::pkgAcquire::Auth=true update && \ apt-get install -y \ ## Utilities curl \ @@ -169,7 +169,7 @@ SHELL ["/bin/bash", "-c"] ARG BASE_IMAGE RUN export SHORT_CUDA_VERSION=${CUDA_VERSION%.*} && \ export OS_RELEASE="$(cat /etc/os-release)" && \ - apt-get update && \ + apt-get -o Debug::pkgAcquire::Auth=true update && \ if [[ ${OS_RELEASE} == *"Bionic"* ]]; then \ if [ ${SHORT_CUDA_VERSION} = 11.0 ]; then \ TRT_VERSION="7.2.0-1+cuda11.0"; \