Make environment:mpi:gpu optional (#150)

* add test for mpi without specifying gpu
* fix schema
* fix default management

stackinator/schema.py

@@ -14,9 +14,11 @@ def extend_with_default(validator_class):
     validate_properties = validator_class.VALIDATORS["properties"]
 
     def set_defaults(validator, properties, instance, schema):
-        for property, subschema in properties.items():
-            if "default" in subschema:
-                instance.setdefault(property, subschema["default"])
+        # if instance is none, it's not possible to set any default for any sub-property
+        if instance is not None:
+            for property, subschema in properties.items():
+                if "default" in subschema:
+                    instance.setdefault(property, subschema["default"])
 
         for error in validate_properties(
             validator,

stackinator/schema/environments.json

@@ -40,7 +40,10 @@
                              "additionalProperties": false,
                              "properties": {
                                  "spec": {"type": "string"},
-                                 "gpu":  {"enum": ["cuda", "rocm", null, false]}
+                                 "gpu":  {
+					 "enum": ["cuda", "rocm", null, false],
+					 "default": null
+				 }
                              }
                          },
                          {"enum": [null, false]}

unittests/test_schema.py

@@ -115,6 +115,10 @@ def test_environments_yaml(yaml_path):
         assert env["mpi"] is None
         assert env["views"] == {}
 
+        env = raw["defaults-env-mpi-nogpu"]
+        assert env["mpi"]["spec"] is not None
+        assert env["mpi"]["gpu"] is None
+
         # the full-env sets all of the fields
         # test that they have been read correctly
 

unittests/yaml/environments.full.yaml

@@ -30,3 +30,11 @@ defaults-env:
   # assert mpi=None
   # assert packages=[]
   # assert view=True
+defaults-env-mpi-nogpu:
+  compiler:
+  - toolchain: gcc
+    spec: gcc@11
+  specs:
+  - tree
+  mpi:
+    spec: cray-mpich