Update oneapi and nvhpc base containers, remove centos:8 container bu…

…ilds
samcmill · Jun 1, 2022 · acb58f4 · acb58f4
1 parent 5a3d8b8
commit acb58f4
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 114 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -16,8 +16,6 @@ jobs:
           - amazonlinux2-llvm
           - centos7-gnu
           - centos7-llvm
-          - centos8-gnu
-          - centos8-llvm
           - nvhpc
           - oneapi
           - rockylinux8-gnu

diff --git a/containers/Dockerfile.centos8-gnu b/containers/Dockerfile.centos8-gnu
diff --git a/containers/Dockerfile.centos8-llvm b/containers/Dockerfile.centos8-llvm
diff --git a/containers/Dockerfile.nvhpc b/containers/Dockerfile.nvhpc
@@ -1,6 +1,6 @@
 # wassail container
 
-FROM nvcr.io/nvidia/nvhpc:21.7-devel-cuda11.4-ubuntu20.04
+FROM nvcr.io/nvidia/nvhpc:22.3-devel-cuda11.6-ubuntu20.04
 
 # Python
 RUN apt-get update -y && \

diff --git a/containers/Dockerfile.oneapi b/containers/Dockerfile.oneapi
@@ -1,6 +1,6 @@
 # wassail container
 
-FROM intel/oneapi-hpckit:2021.3-devel-ubuntu18.04
+FROM intel/oneapi-hpckit:devel-ubuntu18.04
 
 # Python
 RUN apt-get update -y && \

diff --git a/containers/recipe.py b/containers/recipe.py
@@ -8,10 +8,10 @@
 apt = []
 
 if toolset == 'nvhpc':
-  Stage0 += baseimage(image='nvcr.io/nvidia/nvhpc:21.7-devel-cuda11.4-ubuntu20.04')
+  Stage0 += baseimage(image='nvcr.io/nvidia/nvhpc:22.3-devel-cuda11.6-ubuntu20.04')
   toolchain = hpccm.toolchain(CC='nvc', CXX='nvc++', CXXFLAGS='-O1')
 elif toolset == 'oneapi':
-  Stage0 += baseimage(image='intel/oneapi-hpckit:2021.3-devel-ubuntu18.04')
+  Stage0 += baseimage(image='intel/oneapi-hpckit:devel-ubuntu18.04')
   toolchain = hpccm.toolchain(CC='icx', CXX='icpx')
 else:
   if image == 'ubuntu:20.04':