Merge remote-tracking branch 'upstream/develop' into develop

Author: RikkiButler20

lib/spack/spack/solver/concretize.lp

@@ -1011,16 +1011,6 @@ node_os_weight(PackageNode, Weight)
     attr("node_os", PackageNode, OS),
     os(OS, Weight).
 
-% match semantics for OS's
-node_os_match(PackageNode, DependencyNode) :-
-   depends_on(PackageNode, DependencyNode),
-   attr("node_os", PackageNode, OS),
-   attr("node_os", DependencyNode, OS).
-
-node_os_mismatch(PackageNode, DependencyNode) :-
-   depends_on(PackageNode, DependencyNode),
-   not node_os_match(PackageNode, DependencyNode).
-
 % every OS is compatible with itself. We can use `os_compatible` to declare
 os_compatible(OS, OS) :- os(OS).
 
@@ -1509,16 +1499,6 @@ opt_criterion(39, "compiler mismatches that are not from CLI").
       build_priority(PackageNode, Priority)
 }.
 
-% Try to minimize the number of compiler mismatches in the DAG.
-opt_criterion(35, "OS mismatches").
-#minimize{ 0@235: #true }.
-#minimize{ 0@35: #true }.
-#minimize{
-    1@35+Priority,PackageNode,DependencyNode
-    : node_os_mismatch(PackageNode, DependencyNode),
-      build_priority(PackageNode, Priority)
-}.
-
 opt_criterion(30, "non-preferred OS's").
 #minimize{ 0@230: #true }.
 #minimize{ 0@30: #true }.

lib/spack/spack/target.py

@@ -155,4 +155,5 @@ def optimization_flags(self, compiler):
                 # log this and just return compiler.version instead
                 tty.debug(str(e))
 
+        compiler_version = compiler_version.dotted.force_numeric
         return self.microarchitecture.optimization_flags(compiler.name, str(compiler_version))

lib/spack/spack/version/version_types.py

@@ -193,12 +193,15 @@ def __getitem__(self, idx):
         message = "{cls.__name__} indices must be integers"
         raise TypeError(message.format(cls=cls))
 
+    def _stringify(self):
+        string = ""
+        for index in range(len(self.version)):
+            string += str(self.version[index])
+            string += str(self.separators[index])
+        return string
+
     def __str__(self):
-        return (
-            self.string
-            if isinstance(self.string, str)
-            else ".".join((str(c) for c in self.version))
-        )
+        return self.string or self._stringify()
 
     def __repr__(self) -> str:
         # Print indirect repr through Version(...)
@@ -257,6 +260,21 @@ def isdevelop(self):
             isinstance(p, VersionStrComponent) and isinstance(p.data, int) for p in self.version
         )
 
+    @property
+    def force_numeric(self):
+        """Replaces all non-numeric components of the version with 0
+
+        This can be used to pass Spack versions to libraries that have stricter version schema.
+        """
+        numeric = tuple(0 if isinstance(v, VersionStrComponent) else v for v in self.version)
+        # null separators except the final one have to be converted to avoid concatenating ints
+        # default to '.' as most common delimiter for versions
+        separators = tuple(
+            "." if s == "" and i != len(self.separators) - 1 else s
+            for i, s in enumerate(self.separators)
+        )
+        return type(self)(None, numeric, separators)
+
     @property
     def dotted(self):
         """The dotted representation of the version.

var/spack/repos/builtin/packages/amdlibm/package.py

@@ -8,6 +8,7 @@
 from llnl.util import tty
 
 from spack.package import *
+from spack.util.cpus import determine_number_of_jobs
 
 
 class Amdlibm(SConsPackage):
@@ -65,7 +66,7 @@ class Amdlibm(SConsPackage):
 
     def build_args(self, spec, prefix):
         """Setting build arguments for amdlibm"""
-        args = ["--prefix={0}".format(prefix)]
+        args = [f"-j{determine_number_of_jobs(parallel=True)}", f"--prefix={prefix}"]
 
         if self.spec.satisfies("@4.1: "):
             args.append("--aocl_utils_install_path={0}".format(self.spec["aocl-utils"].prefix))

var/spack/repos/builtin/packages/aocl-sparse/package.py

@@ -108,7 +108,7 @@ def cmake_args(self):
         if spec.satisfies("@3.0:"):
             args.append(self.define_from_variant("BUILD_ILP64", "ilp64"))
 
-        if self.spec.satisfies("@4.0:"):
+        if self.spec.satisfies("@4.1:"):
             args.append(f"-DAOCL_BLIS_LIB={self.spec['amdblis'].libs}")
             args.append(
                 "-DAOCL_BLIS_INCLUDE_DIR={0}/blis".format(self.spec["amdblis"].prefix.include)

var/spack/repos/builtin/packages/apex/package.py

@@ -18,6 +18,7 @@ class Apex(CMakePackage):
 
     version("develop", branch="develop")
     version("master", branch="master")
+    version("2.6.5", sha256="2ba29a1198c904ac209fc6bc02962304a1416443b249f34ef96889aff39644ce")
     version("2.6.4", sha256="281a673f447762a488577beaa60e48d88cb6354f220457cf8f05c1de2e1fce70")
     version("2.6.3", sha256="7fef12937d3bd1271a01abe44cb931b1d63823fb5c74287a332f3012ed7297d5")
     version("2.6.2", sha256="0c3ec26631db7925f50cf4e8920a778b57d11913f239a0eb964081f925129725")

var/spack/repos/builtin/packages/berkeleygw/package.py

@@ -232,7 +232,11 @@ def build(self, spec, prefix):
                 f90_flags += " -fallow-argument-mismatch"
             buildopts.append("COMPFLAG=-DGNU")
             buildopts.append("MOD_OPT=-J ")
-            buildopts.append("FCPP=cpp -C -nostdinc")
+            # std c11 prevents problems with linebreaks and fortran comments
+            # containing // (which is interpreted as C++ style comment)
+            buildopts.append(
+                "FCPP=%s -C -nostdinc -std=c11" % join_path(self.compiler.prefix, "bin", "cpp")
+            )
             if "+mpi" in spec:
                 buildopts.append("F90free=%s %s" % (spec["mpi"].mpifc, f90_flags))
                 buildopts.append("C_COMP=%s %s" % (spec["mpi"].mpicc, c_flags))