arch: fix gpu detection with latest rocm-smi

Author: mloubout

devito/arch/archinfo.py

@@ -270,7 +270,7 @@ def cbk(deviceid=0):
         for line in lines:
             if 'GPU' in line:
                 # Product
-                pattern = r'GPU\[(\d+)\].*?Card series:\s*(.*?)\s*$'
+                pattern = r'GPU\[(\d+)\].*?Card [sS]eries:\s*(.*?)\s*$'
                 match1 = re.match(pattern, line)
 
                 if match1:
@@ -280,7 +280,7 @@ def cbk(deviceid=0):
                     gpu_infos[gid]['product'] = match1.group(2)
 
                 # Model
-                pattern = r'GPU\[(\d+)\].*?Card model:\s*(.*?)\s*$'
+                pattern = r'GPU\[(\d+)\].*?Card [mM]odel:\s*(.*?)\s*$'
                 match2 = re.match(pattern, line)
 
                 if match2:

docker/Dockerfile.amd

@@ -146,7 +146,6 @@ FROM sdk-base as amdclang
 # MPI env
 ENV OMPI_CC="amdclang"
 ENV OMPI_CXX="amdclang++"
-ENV MPICC="amdclang"
 
 # Devito env
 ENV DEVITO_ARCH="aomp"
@@ -162,7 +161,6 @@ FROM sdk-base as hip
 # MPI env
 ENV OMPI_CC="hipcc"
 ENV OMPI_CXX="hipcc"
-ENV MPICC="MPICC"
 
 # Devito env
 ENV DEVITO_ARCH="hip"