nvhpc support - not connected to gcc properly

Author: bcumming

stackinator/main.py

@@ -13,8 +13,9 @@
 
 
 def generate_logfile_name(name=""):
-    idstr = f"{time.localtime()}{os.getpid}{platform.uname()}"
-    return f"log{name}_{hashlib.md5(idstr.encode('utf-8')).hexdigest()}"
+    #idstr = f"{time.localtime()}{os.getpid}{platform.uname()}"
+    #return f"log{name}_{hashlib.md5(idstr.encode('utf-8')).hexdigest()}"
+    return f"stackinator_log"
 
 
 def configure_logging(logfile):

stackinator/recipe.py

@@ -406,28 +406,34 @@ def generate_compiler_specs(self, raw):
         #     "external": [ "perl", "m4", "autoconf", "automake", "libtool", "gawk", "python", "texinfo", "gawk", ],
         # }
 
-        if isinstance(raw["gcc"]["specs"], str):
-            gcc["specs"] = raw["gcc"]["specs"] + " +bootstrap"
-        elif isinstance(raw["gcc"]["specs"], list):
-            gcc["specs"] = list(map(lambda x: x + " +bootstrap", raw["gcc"]["specs"]))
+        gcc["specs"] = [raw["gcc"]["spec"] + " +bootstrap"]
 
         gcc["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
         compilers["gcc"] = gcc
 
-        if raw["llvm"] is not None:
-            llvm = {}
-            llvm["packages"] = False
-            llvm["specs"] = []
-            for spec in raw["llvm"]["specs"]:
-                if spec.startswith("nvhpc"):
-                    llvm["specs"].append(f"{spec}~mpi~blas~lapack")
-
-                if spec.startswith("llvm"):
-                    llvm["specs"].append(f"{spec} +clang targets=x86 ~gold ^ninja@kitware")
-
-            llvm["requires"] = raw["llvm"]["requires"]
-            llvm["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
-            compilers["llvm"] = llvm
+        # TODO: fix up using gcc as an upstream of nvhpc
+        if raw["nvhpc"] is not None:
+            nvhpc = {}
+            nvhpc["packags"] = False
+            nvhpc["specs"] = [raw["nvhpc"]["spec"] + " ~mpi~blas~lapack"]
+
+            nvhpc["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
+            compilers["nvhpc"] = nvhpc
+
+        # if raw["llvm"] is not None:
+        #    llvm = {}
+        #    llvm["packages"] = False
+        #    llvm["specs"] = []
+        #    for spec in raw["llvm"]["specs"]:
+        #        if spec.startswith("nvhpc"):
+        #            llvm["specs"].append(f"{spec}~mpi~blas~lapack")
+        #
+        #        if spec.startswith("llvm"):
+        #            llvm["specs"].append(f"{spec} +clang targets=x86 ~gold ^ninja@kitware")
+        #
+        #    llvm["requires"] = raw["llvm"]["requires"]
+        #    llvm["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
+        #    compilers["llvm"] = llvm
 
         self.compilers = compilers
 

stackinator/schema/compilers.json

@@ -9,49 +9,29 @@
             "type": "string",
             "pattern": "^gcc@\\d{1,2}(\\.\\d{1}(\\.\\d{1})?)?$"
         },
-        "gcc_version_spec_list": {
-            "type": "array",
-            "items": {"$ref": "#/defs/gcc_version_spec"},
-            "minItems": 1
-        },
-        "llvm_version_spec": {
-            "type": "string",
-            "pattern": "^llvm@\\d{1,2}(\\.\\d{1}(\\.\\d{1})?)?$"
-        },
         "nvhpc_version_spec": {
             "type": "string",
             "pattern": "^nvhpc@\\d{2}(\\.\\d{1,2})?$"
-        },
-        "llvm_version_spec_list": {
-            "type": "array",
-            "items": {
-                "anyOf": [
-                    {"$ref": "#/defs/llvm_version_spec"},
-                    {"$ref": "#/defs/nvhpc_version_spec"}
-                ]
-            },
-            "minItems": 1
         }
     },
     "properties": {
         "gcc": {
             "type": "object",
             "properties": {
-                "specs": {"$ref": "#/defs/gcc_version_spec_list"}
+                "spec": {"$ref": "#/defs/gcc_version_spec"}
             },
             "additionalProperties": false,
-            "required": ["specs"]
+            "required": ["spec"]
         },
-        "llvm": {
+        "nvhpc": {
             "oneOf": [
                 {
                     "type": "object",
                     "properties": {
-                        "requires": {"$ref": "#/defs/gcc_version_spec"},
-                        "specs": {"$ref": "#/defs/llvm_version_spec_list"}
+                        "spec": {"$ref": "#/defs/nvhpc_version_spec"}
                     },
                     "additionalProperties": false,
-                    "required": ["requires", "specs"]
+                    "required": ["spec"]
                 },
                 {
                     "type": "null"

stackinator/schema/config.json

@@ -16,6 +16,7 @@
             "type" : "object",
             "additionalProperties": false,
             "properties" : {
+                "required": ["repo", "commit", "packages"],
                 "repo": {
                     "type": "string"
                 },
@@ -29,6 +30,7 @@
                 "packages" : {
                     "type" : "object",
                     "additionalProperties": false,
+                    "required": ["repo", "commit"],
                     "properties" : {
                         "repo": {
                             "type": "string"

stackinator/templates/Makefile.compilers

@@ -61,5 +61,11 @@ include llvm/Makefile
 endif
 {% endif %}
 
+{% if compilers.nvhpc %}
+ifneq (,$(wildcard gcc/Makefile))
+include nvhpc/Makefile
+endif
+{% endif %}
+
 
 endif