make modules actually optional

skip also default modules.yaml when config:modules:false

Author: albestro

stackinator/builder.py

@@ -463,6 +463,7 @@ def generate(self, recipe):
         with (generate_config_path / "Makefile").open("w") as f:
             f.write(
                 make_config_template.render(
+                    modules=recipe.config["modules"],
                     build_path=self.path.as_posix(),
                     all_compilers=all_compilers,
                     release_compilers=all_compilers,
@@ -471,11 +472,12 @@ def generate(self, recipe):
             )
 
         # write modules/modules.yaml
-        modules_yaml = recipe.modules_yaml
-        generate_modules_path = self.path / "modules"
-        generate_modules_path.mkdir(exist_ok=True)
-        with (generate_modules_path / "modules.yaml").open("w") as f:
-            f.write(modules_yaml)
+        if recipe.config["modules"]:
+            modules_yaml = recipe.modules_yaml
+            generate_modules_path = self.path / "modules"
+            generate_modules_path.mkdir(exist_ok=True)
+            with (generate_modules_path / "modules.yaml").open("w") as f:
+                f.write(modules_yaml)
 
         # write the meta data
         meta_path = store_path / "meta"

stackinator/recipe.py

@@ -63,13 +63,13 @@ def __init__(self, args):
             self.generate_compiler_specs(raw)
 
         # optional modules.yaml file
-        modules_path = self.path / "modules.yaml"
-        self._logger.debug(f"opening {modules_path}")
-        if not modules_path.is_file():
-            modules_path = pathlib.Path(args.build) / "spack/etc/spack/defaults/base/modules.yaml"
-            self._logger.debug(f"no modules.yaml provided - using the {modules_path}")
-
-        self.modules = modules_path
+        if self.config["modules"]:
+            modules_path = self.path / "modules.yaml"
+            self._logger.debug(f"opening {modules_path}")
+            if not modules_path.is_file():
+                modules_path = pathlib.Path(args.build) / "spack/etc/spack/defaults/base/modules.yaml"
+                self._logger.debug(f"no modules.yaml provided - using the {modules_path}")
+            self.modules = modules_path
 
         # optional packages.yaml file
         packages_path = self.path / "packages.yaml"
@@ -314,7 +314,10 @@ def environment_view_meta(self):
         return view_meta
 
     @property
-    def modules_yaml(self):
+    def modules_yaml(self) -> str:
+        if not self.config["modules"]:
+            raise RuntimeError("modules are not enabled in config.yaml")
+
         with self.modules.open() as fid:
             raw = yaml.load(fid, Loader=yaml.Loader)
             raw["modules"]["default"]["roots"]["tcl"] = (pathlib.Path(self.mount) / "modules").as_posix()

stackinator/templates/Makefile.generate-config

@@ -10,7 +10,7 @@ ALL_COMPILER_PREFIXES ={% for compiler in all_compilers %} $$($(SPACK_HELPER) -e
 COMPILER_PREFIXES ={% for compiler in release_compilers %} $$($(SPACK_HELPER) -e ../compilers/{{ compiler }} find --explicit --format='{prefix}' gcc llvm llvm-amdgpu nvhpc){% endfor %}
 
 
-all: $(CONFIG_DIR)/upstreams.yaml $(CONFIG_DIR)/packages.yaml $(CONFIG_DIR)/repos.yaml $(MODULE_DIR)/upstreams.yaml $(MODULE_DIR)/compilers.yaml
+all: $(CONFIG_DIR)/upstreams.yaml $(CONFIG_DIR)/packages.yaml $(CONFIG_DIR)/repos.yaml{% if modules %} $(MODULE_DIR)/upstreams.yaml $(MODULE_DIR)/compilers.yaml{% endif %}
 
 # Generate the upstream configuration that will be provided by the mounted image
 $(CONFIG_DIR)/upstreams.yaml: