From 9aafbec121e6cb2a36034c079fe44636c4a9487d Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Fri, 18 Nov 2022 10:54:04 +0100 Subject: openblas: Fix build on ARM Neoverse with gcc@:9 (no sve2+bf16) (#33968) Also improve the InstallError message when +fortran but no FC was added. Co-authored-by: Bernhard Kaindl --- var/spack/repos/builtin/packages/openblas/package.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index e9d3a50d46..099d00fb56 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -168,6 +168,19 @@ class Openblas(MakefilePackage): # See patch("linktest.patch", when="@0.3.20") + # Fix build on ARM Neoverse N1 when using gcc@:9. The 1st patch is context for the 2nd patch: + patch( + "https://github.com/xianyi/OpenBLAS/commit/68277282df4adaafaf9b4a01c2eeb629eed99528.patch?full_index=1", + sha256="a4c642fbaeafbf4178558368212594e99c74a7b6c2a119fd0627f7b54f1ebfb3", + when="@0.3.21 %gcc@:9", + ) + # gcc@:9 doesn't support sve2 and bf16 architecture features, apply upstream fix: + patch( + "https://github.com/xianyi/OpenBLAS/commit/c957ad684ed6b8ca64f332221b376f2ad0fdc51a.patch?full_index=1", + sha256="c20f5188a9145395c37c22ae5c1f72bfc24edfbccbb636cc8f9227345615daa8", + when="@0.3.21 %gcc@:9", + ) + # See https://github.com/spack/spack/issues/19932#issuecomment-733452619 conflicts("%gcc@7.0.0:7.3,8.0.0:8.2", when="@0.3.11:") @@ -223,7 +236,10 @@ class Openblas(MakefilePackage): # a f2c translated LAPACK version # https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.21 if self.compiler.fc is None and "~fortran" not in self.spec: - raise InstallError("OpenBLAS requires both C and Fortran compilers!") + raise InstallError( + self.compiler.cc + + " has no Fortran compiler added in spack. Add it or use openblas~fortran!" + ) @staticmethod def _read_targets(target_file): -- cgit v1.2.3-70-g09d2