arch: max apple mcpu

devitocodes · Jan 16, 2024 · 81372ec · 81372ec
1 parent 553f3ef
commit 81372ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/devito/arch/archinfo.py b/devito/arch/archinfo.py
@@ -715,7 +715,9 @@ class AppleArm(Arm):
     def march(self):
         sysinfo = run(["sysctl", "-n", "machdep.cpu.brand_string"],
                       stdout=PIPE, stderr=DEVNULL).stdout.decode("utf-8")
-        return sysinfo.split(' ')[1].lower()
+        mx = sysinfo.split(' ')[1].lower()
+        # Currently clang only supports up to m2
+        return min(mx, 'm2')
 
 
 class Amd(Cpu64):

diff --git a/devito/arch/compiler.py b/devito/arch/compiler.py
@@ -236,11 +236,9 @@ def version(self):
             except (TypeError, ValueError):
                 version = Version(self.suffix)
         else:
-            try:
-                # Knowing the version may still be useful to pick supported flags
-                version = sniff_compiler_version(self.CC)
-            except (FileNotFoundError, OSError):
-                version = Version("0")
+            # Knowing the version may still be useful to pick supported flags
+            version = sniff_compiler_version(self.CC)
+
         return version
 
     def get_version(self):

diff --git a/examples/seismic/model.py b/examples/seismic/model.py
@@ -167,7 +167,7 @@ def physical_params(self, **kwargs):
         return {i.name: kwargs.get(i.name, i) or i for i in known}
 
     def _gen_phys_param(self, field, name, space_order, is_param=True,
-                        default_value=0):
+                        default_value=0, **kwargs):
         if field is None:
             return default_value
         if isinstance(field, np.ndarray):