Merge branch 'davschneller/compile-fixes' into davschneller/ci

SeisSol · May 21, 2024 · a774544 · a774544
2 parents 3df7c30 + 759bf14
commit a774544
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/pspamm/VERSION b/pspamm/VERSION
@@ -1 +1 @@
-0.2.1
+0.2.2
diff --git a/pspamm/codegen/architectures/arm/generator.py b/pspamm/codegen/architectures/arm/generator.py
@@ -69,8 +69,8 @@ def bcst_alpha_beta(self,
                         ) -> Block:
 
         asm = block("Broadcast alpha and beta so that efficient multiplication is possible")
-        asm.add(mov(alpha_reg[0], alpha_reg[1], True))
-        asm.add(mov(beta_reg[0], beta_reg[1], True))
+        # asm.add(mov(alpha_reg[0], alpha_reg[1], True))
+        # asm.add(mov(beta_reg[0], beta_reg[1], True))
         return asm
 
     def make_scaling_offsets(self,

diff --git a/pspamm/codegen/architectures/arm_sve/generator.py b/pspamm/codegen/architectures/arm_sve/generator.py
@@ -104,8 +104,8 @@ def bcst_alpha_beta(self,
                         ) -> Block:
 
         asm = block("Broadcasted alpha and beta into z0/z1 so that efficient multiplication is possible")
-        asm.add(mov(alpha_reg[0], alpha_reg[1], True))
-        asm.add(mov(beta_reg[0], beta_reg[1], True))
+        # asm.add(mov(alpha_reg[0], alpha_reg[1], True))
+        # asm.add(mov(beta_reg[0], beta_reg[1], True))
         return asm
 
     def make_scaling_offsets(self,

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,7 @@
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "PspaMM"
 description="Inline assembly generator for sparse matrix multiplications"
@@ -20,11 +24,6 @@ classifiers= [
     "Operating System :: OS Independent",
 ]
 dynamic = ["version", "readme", "dependencies"]
-dependencies = {file = ["requirements.txt"]}
-
-[build-system]
-requires = ["setuptools>=61.0.0", "wheel"]
-build-backend = "setuptools.build_meta"
 
 [tool.setuptools.dynamic]
 readme = {file = ["README.md"], content-type = "text/markdown"}