zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sgpp: allow building on aarch64 (#18968)

Browse Source
This commit is contained in:
t-nojiri 2020-09-26 00:20:35 +09:00 committed by GitHub
parent 9c5a47183e
commit 51b90edd78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
var/spack/repos/builtin/packages/sgpp/for_aarch64.patch Normal file
View File

@ -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")

2
var/spack/repos/builtin/packages/sgpp/package.py
View File

@ -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: