From cd96e9bf34425b76b884acd52ce858fcb0db14af Mon Sep 17 00:00:00 2001 From: Kristof Kessler Date: Tue, 8 Oct 2024 21:42:41 +0200 Subject: [PATCH 1/5] Update test_mkl.py --- test/test_mkl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_mkl.py b/test/test_mkl.py index 6bd90166..44465dee 100644 --- a/test/test_mkl.py +++ b/test/test_mkl.py @@ -53,7 +53,7 @@ def test_basic_ubuntu(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2020.0-088 && \ @@ -90,7 +90,7 @@ def test_version(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2018.2-046 && \ @@ -112,7 +112,7 @@ def test_mklvars(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2019.4-070 && \ @@ -138,7 +138,7 @@ def test_runtime(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2020.0-088 && \ From a8a96c3ead39440d7a5f49b186d7b3e97ab0ae63 Mon Sep 17 00:00:00 2001 From: Kristof Kessler Date: Tue, 8 Oct 2024 21:47:06 +0200 Subject: [PATCH 2/5] Update test_mkl.py --- test/test_mkl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_mkl.py b/test/test_mkl.py index 44465dee..8231124b 100644 --- a/test/test_mkl.py +++ b/test/test_mkl.py @@ -53,7 +53,7 @@ def test_basic_ubuntu(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2020.0-088 && \ @@ -90,7 +90,7 @@ def test_version(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2018.2-046 && \ @@ -112,7 +112,7 @@ def test_mklvars(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2019.4-070 && \ @@ -138,7 +138,7 @@ def test_runtime(self): wget && \ rm -rf /var/lib/apt/lists/* RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | apt-key add - && \ - echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ + echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.gpg] https://apt.repos.intel.com/mkl all main" >> /etc/apt/sources.list.d/hpccm.list && \ apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ intel-mkl-64bit-2020.0-088 && \ From 2a26792fc790142ee1f862ecc48bfe6300b1504b Mon Sep 17 00:00:00 2001 From: Kristof Kessler Date: Tue, 8 Oct 2024 21:54:10 +0200 Subject: [PATCH 3/5] Update mkl.py --- hpccm/building_blocks/mkl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hpccm/building_blocks/mkl.py b/hpccm/building_blocks/mkl.py index dfbd39cc..2a37c8fb 100644 --- a/hpccm/building_blocks/mkl.py +++ b/hpccm/building_blocks/mkl.py @@ -120,7 +120,7 @@ def __instructions(self): self += packages( _apt_key=True, apt_keys=['https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.PUB'.format(self.__year)], - apt_repositories=['deb https://apt.repos.intel.com/mkl all main'], + apt_repositories=['deb [signed-by=/usr/share/keyrings/'+'GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.gpg'.format(self.__year+'] https://apt.repos.intel.com/mkl all main'], ospackages=['intel-mkl-64bit-{}'.format(self.__version)], yum_keys=['https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.PUB'.format(self.__year)], yum_repositories=['https://yum.repos.intel.com/mkl/setup/intel-mkl.repo']) From 7a32d1898a230e32168397c781c432452cc2287d Mon Sep 17 00:00:00 2001 From: Kristof Kessler Date: Thu, 10 Oct 2024 15:18:46 +0200 Subject: [PATCH 4/5] Update mkl.py --- hpccm/building_blocks/mkl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hpccm/building_blocks/mkl.py b/hpccm/building_blocks/mkl.py index 2a37c8fb..6f13411a 100644 --- a/hpccm/building_blocks/mkl.py +++ b/hpccm/building_blocks/mkl.py @@ -120,7 +120,7 @@ def __instructions(self): self += packages( _apt_key=True, apt_keys=['https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.PUB'.format(self.__year)], - apt_repositories=['deb [signed-by=/usr/share/keyrings/'+'GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.gpg'.format(self.__year+'] https://apt.repos.intel.com/mkl all main'], + apt_repositories=['deb [signed-by=/usr/share/keyrings/'+'GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.gpg'.format(self.__year)+'] https://apt.repos.intel.com/mkl all main'], ospackages=['intel-mkl-64bit-{}'.format(self.__version)], yum_keys=['https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.PUB'.format(self.__year)], yum_repositories=['https://yum.repos.intel.com/mkl/setup/intel-mkl.repo']) From c91e92bcb6110f1cb4b4490f2b65b8960e9569b1 Mon Sep 17 00:00:00 2001 From: Kristof Kessler Date: Wed, 16 Oct 2024 16:25:35 +0200 Subject: [PATCH 5/5] Update mkl.py --- hpccm/building_blocks/mkl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hpccm/building_blocks/mkl.py b/hpccm/building_blocks/mkl.py index 6f13411a..5323fe1c 100644 --- a/hpccm/building_blocks/mkl.py +++ b/hpccm/building_blocks/mkl.py @@ -118,9 +118,9 @@ def __instructions(self): raise RuntimeError('Intel EULA was not accepted. To accept, see the documentation for this building block') self += packages( - _apt_key=True, + _apt_key=False, apt_keys=['https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.PUB'.format(self.__year)], - apt_repositories=['deb [signed-by=/usr/share/keyrings/'+'GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.gpg'.format(self.__year)+'] https://apt.repos.intel.com/mkl all main'], + apt_repositories=['deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.gpg] https://apt.repos.intel.com/mkl all main'.format(self.__year)], ospackages=['intel-mkl-64bit-{}'.format(self.__version)], yum_keys=['https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-{}.PUB'.format(self.__year)], yum_repositories=['https://yum.repos.intel.com/mkl/setup/intel-mkl.repo'])