wip

eth-cscs · Jun 18, 2024 · 39b3487 · 39b3487
1 parent c04f2bf
commit 39b3487
Show file tree

Hide file tree

Showing 14 changed files with 1,092 additions and 2 deletions.
diff --git a/stackinator/envvars.py b/stackinator/envvars.py
diff --git a/stackinator/recipe.py b/stackinator/recipe.py
@@ -337,7 +337,9 @@ def generate_environment_specs(self, raw):
                     view_config = {"root": str(self.mount / "env" / view_name)}
                 else:
                     view_config["root"] = str(self.mount / "env" / view_name)
-                environments[cname]["view"] = {"name": view_name, "config": view_config}
+                extra = view_config.pop("uenv")
+
+                environments[cname]["view"] = {"name": view_name, "config": view_config, "extra": extra}
 
         self.environments = environments
 

diff --git a/stackinator/schema/environments.json b/stackinator/schema/environments.json
@@ -84,6 +84,20 @@
                                     "patternProperties": {
                                         "all|\\w[\\w-]*": {"type": "string"}
                                     }
+                                },
+                                "uenv": {
+                                    "type": "object",
+                                    "additionalPropertis": false,
+                                    "properties": {
+                                        "add_compilers": {
+                                            "type": "boolean",
+                                            "default": true
+                                        }
+                                        "set_ld_library_path": {
+                                            "type": "boolean",
+                                            "default": false
+                                        }
+                                    }
                                 }
                             }
                         }

diff --git a/stackinator/templates/Makefile.environments b/stackinator/templates/Makefile.environments
@@ -34,9 +34,10 @@ all:{% for env in environments %} {{ env }}/generated/build_cache{% endfor %}
 {% if config.view %}
 {% if develop or (spack_version>="0.21") %}
 	$(SPACK) env activate --with-view default --sh ./{{ env }} > $(STORE)/env/{{ config.view.name }}/activate.sh
-	$(SOFTWARE_STACK_PROJECT)/add-compiler-links.py  ./{{ env }}/compilers.yaml $(STORE)/env/{{ config.view.name }}/activate.sh $(SOFTWARE_STACK_PROJECT)
 {% else %}
 	$(SPACK) env activate --with-view --sh ./{{ env }} > $(STORE)/env/{{ config.view.name }}/activate.sh
+{% endif %}
+{% if config.view.extra.add_compilers or config.view.extra.add_ld_library_path %}
 	$(SOFTWARE_STACK_PROJECT)/add-compiler-links.py  ./{{ env }}/compilers.yaml $(STORE)/env/{{ config.view.name }}/activate.sh $(SOFTWARE_STACK_PROJECT)
 {% endif %}
 {% endif %}