diff options
| author | t-nojiri <68096132+t-nojiri@users.noreply.github.com> | 2020-09-26 00:20:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 17:20:35 +0200 |
| commit | 51b90edd78009627a63360eab25786aa5a42afbc (patch) | |
| tree | a118f2a1f7456b6fba0c5be15f836d61e13b7424 /var | |
| parent | 9c5a47183eb8b144d57fa47528105de2fd4b680f (diff) | |
| download | spack-51b90edd78009627a63360eab25786aa5a42afbc.tar.gz spack-51b90edd78009627a63360eab25786aa5a42afbc.tar.bz2 spack-51b90edd78009627a63360eab25786aa5a42afbc.tar.xz spack-51b90edd78009627a63360eab25786aa5a42afbc.zip | |
sgpp: allow building on aarch64 (#18968)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/sgpp/for_aarch64.patch | 49 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sgpp/package.py | 2 |
2 files changed, 51 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/sgpp/for_aarch64.patch b/var/spack/repos/builtin/packages/sgpp/for_aarch64.patch new file mode 100644 index 0000000000..9af2da3758 --- /dev/null +++ b/var/spack/repos/builtin/packages/sgpp/for_aarch64.patch @@ -0,0 +1,49 @@ +--- spack-src/SConstruct.bak 2020-03-24 03:25:47.000000000 +0900 ++++ spack-src/SConstruct 2020-09-25 15:35:55.458303510 +0900 +@@ -106,7 +106,7 @@ + converter=Helper.multiParamPathConverter) + vars.Add("ARCH", "Set the architecture, the possible values are compiler-dependent, " + + "for COMPILER=gnu, e.g., the following values are possible: " + +- "sse3, sse42, avx, fma4, avx2, avx512", "sse3") ++ "sse3, sse42, avx, fma4, avx2, avx512", "aarch64") + vars.Add("COMPILER", "Set the compiler, \"gnu\" means using gcc with standard configuration, " + + "the following values are possible: " + + "gnu, clang, intel, openmpi, mpich, intel.mpi; " + +--- spack-src/site_scons/SGppConfigure.py.bak 2020-03-24 03:25:47.000000000 +0900 ++++ spack-src/site_scons/SGppConfigure.py 2020-09-25 15:25:30.168317321 +0900 +@@ -454,7 +454,7 @@ + # ensure you also compile with -fno-strict-aliasing" + config.env.Append(CPPFLAGS=allWarnings + [ + "-fno-strict-aliasing", +- "-funroll-loops", "-mfpmath=sse"]) ++ "-funroll-loops"]) + + # Mitigation for old Ubuntu (should probably be also applied to Debian?): + # Package 'libomp-dev' installs a symlink 'libgomp.so' to 'libomp.so' in /usr/lib/x86_64-linux. +@@ -520,6 +520,8 @@ + config.env.AppendUnique(CPPFLAGS=["-mavx512f"]) + config.env.AppendUnique(CPPFLAGS=["-mavx512cd"]) + config.env.AppendUnique(CPPFLAGS=["-mfma"]) ++ elif config.env["ARCH"] == "aarch64": ++ config.env.AppendUnique(CPPFLAGS=[""]) + else: + Helper.printErrorAndExit("You must specify a valid ARCH value for gnu.", + "Available configurations are: sse3, sse42, avx, fma4, avx2, avx512") +@@ -586,6 +588,8 @@ + config.env.AppendUnique(CPPFLAGS=["-mavx512f"]) + config.env.AppendUnique(CPPFLAGS=["-mavx512cd"]) + config.env.AppendUnique(CPPFLAGS=["-mfma"]) ++ elif config.env["ARCH"] == "aarch64": ++ config.env.AppendUnique(CPPFLAGS=[""]) + else: + Helper.printErrorAndExit("You must specify a valid ARCH value for clang.", + "Available configurations are: sse3, sse4.2, avx, fma4, avx2, avx512") +@@ -639,6 +643,8 @@ + config.env.AppendUnique(CPPFLAGS=["-mmic"]) + config.env.AppendUnique(LINKFLAGS=["-mmic"]) + config.env["CPPDEFINES"]["USEMIC"] = "1" ++ elif config.env["ARCH"] == "aarch64": ++ config.env.AppendUnique(CPPFLAGS=[""]) + else: + Helper.printErrorAndExit("You must specify a valid ARCH value for intel.", + "Available configurations are: sse3, sse4.2, avx, avx2, avx512, mic") diff --git a/var/spack/repos/builtin/packages/sgpp/package.py b/var/spack/repos/builtin/packages/sgpp/package.py index 728638500f..7afddd732c 100644 --- a/var/spack/repos/builtin/packages/sgpp/package.py +++ b/var/spack/repos/builtin/packages/sgpp/package.py @@ -122,6 +122,8 @@ class Sgpp(SConsPackage): conflicts('+combigrid', when='@:3.2.0~solver') conflicts('+combigrid', when='@:3.2.0~quadrature') + patch('for_aarch64.patch', when='target=aarch64:') + def build_args(self, spec, prefix): # Testing parameters if self.run_tests: |