docker: Push icx image with icc tag

devitocodes · Jun 1, 2023 · 851f488 · 851f488
1 parent aa0d199
commit 851f488
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/docker-bases.yml b/.github/workflows/docker-bases.yml
@@ -66,7 +66,7 @@ jobs:
             dockerfile: './docker/Dockerfile.cpu'
             runner: ubuntu-latest 
 
-          - tag: 'devitocodes/bases:cpu-icc'
+          - tag: 'devitocodes/bases:cpu-icc, devitocodes/bases:cpu-icx'
             arch: 'arch=icc'
             version: ''
             dockerfile: './docker/Dockerfile.cpu'

diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
@@ -96,23 +96,20 @@ jobs:
           python-version: '3.7'
           os: ubuntu-latest
           arch: "gcc"
-          tag: "gcc"
           language: "openmp"
           sympy: "1.10"
 
         - name: pytest-docker-py37-icc-omp
           python-version: '3.7'
           os: ubuntu-22.04
           arch: "icc"
-          tag: "icc"
           language: "openmp"
           sympy: "1.11"
 
         - name: pytest-docker-py38-icx-omp
           python-version: '3.8'
           os: ubuntu-22.04
           arch: "icx"
-          tag: "icc"
           language: "openmp"
           sympy: "1.11"
 
@@ -139,7 +136,7 @@ jobs:
     - name: Build docker image
       if: contains(matrix.name, 'docker')
       run: |
-          docker build . --file docker/Dockerfile.devito --tag devito_img --build-arg base=devitocodes/bases:cpu-${{ matrix.tag }}
+          docker build . --file docker/Dockerfile.devito --tag devito_img --build-arg base=devitocodes/bases:cpu-${{ matrix.arch }}
 
     - name: Set run prefix
       run: |

diff --git a/devito/arch/compiler.py b/devito/arch/compiler.py
@@ -424,7 +424,7 @@ def __init__(self, *args, **kwargs):
 class ClangCompiler(Compiler):
 
     def __init__(self, *args, **kwargs):
-        super(ClangCompiler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.cflags += ['-Wno-unused-result', '-Wno-unused-variable']
         if not configuration['safe-math']:
@@ -491,7 +491,7 @@ class AOMPCompiler(Compiler):
     """AMD's fork of Clang for OpenMP offloading on both AMD and NVidia cards."""
 
     def __init__(self, *args, **kwargs):
-        super(AOMPCompiler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.cflags += ['-Wno-unused-result', '-Wno-unused-variable']
         if not configuration['safe-math']:
@@ -541,7 +541,7 @@ def __lookup_cmds__(self):
 class PGICompiler(Compiler):
 
     def __init__(self, *args, **kwargs):
-        super(PGICompiler, self).__init__(*args, cpp=True, **kwargs)
+        super().__init__(*args, cpp=True, **kwargs)
 
         self.cflags.remove('-std=c99')
         self.cflags.remove('-O3')
@@ -681,7 +681,7 @@ def __lookup_cmds__(self):
 class IntelCompiler(Compiler):
 
     def __init__(self, *args, **kwargs):
-        super(IntelCompiler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.cflags.append("-xHost")
         platform = kwargs.pop('platform', configuration['platform'])
@@ -728,7 +728,7 @@ def __lookup_cmds__(self):
 class IntelKNLCompiler(IntelCompiler):
 
     def __init__(self, *args, **kwargs):
-        super(IntelKNLCompiler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.cflags.append('-xMIC-AVX512')
 
@@ -741,7 +741,7 @@ def __init__(self, *args, **kwargs):
 class OneapiCompiler(IntelCompiler):
 
     def __init__(self, *args, **kwargs):
-        super(OneapiCompiler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         platform = kwargs.pop('platform', configuration['platform'])
         language = kwargs.pop('language', configuration['language'])