wip

Author: simonpintarelli

stackinator/builder.py

@@ -490,13 +490,11 @@ def generate(self, recipe):
         generate_config_path.mkdir(exist_ok=True)
 
         # write generate-config/Makefile
-        all_compilers = [x for x in recipe.compilers.keys()]
-        release_compilers = [x for x in all_compilers if x != "bootstrap"]
+        release_compilers = [x for x in recipe.compilers.keys()]
         with (generate_config_path / "Makefile").open("w") as f:
             f.write(
                 make_config_template.render(
                     build_path=self.path.as_posix(),
-                    all_compilers=all_compilers,
                     release_compilers=release_compilers,
                     verbose=False,
                 )

stackinator/recipe.py

@@ -406,35 +406,35 @@ def generate_environment_specs(self, raw):
     def generate_compiler_specs(self, raw):
         compilers = {}
 
-        bootstrap = {}
-        bootstrap["packages"] = {
-            "external": [
-                "perl",
-                "m4",
-                "autoconf",
-                "automake",
-                "libtool",
-                "gawk",
-                "python",
-                "texinfo",
-                "gawk",
-            ],
-            "variants": {
-                "gcc": "[build_type=Release ~bootstrap +strip]",
-                "mpc": "[libs=static]",
-                "gmp": "[libs=static]",
-                "mpfr": "[libs=static]",
-                "zstd": "[libs=static]",
-                "zlib": "[~shared]",
-            },
-        }
-        bootstrap_spec = raw["bootstrap"]["spec"]
-        bootstrap["specs"] = [
-            f"{bootstrap_spec} languages=c,c++",
-            "squashfs default_compression=zstd",
-        ]
-        bootstrap["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
-        compilers["bootstrap"] = bootstrap
+        # bootstrap = {}
+        # bootstrap["packages"] = {
+        #     "external": [
+        #         "perl",
+        #         "m4",
+        #         "autoconf",
+        #         "automake",
+        #         "libtool",
+        #         "gawk",
+        #         "python",
+        #         "texinfo",
+        #         "gawk",
+        #     ],
+        #     "variants": {
+        #         "gcc": "[build_type=Release ~bootstrap +strip]",
+        #         "mpc": "[libs=static]",
+        #         "gmp": "[libs=static]",
+        #         "mpfr": "[libs=static]",
+        #         "zstd": "[libs=static]",
+        #         "zlib": "[~shared]",
+        #     },
+        # }
+        # bootstrap_spec = raw["bootstrap"]["spec"]
+        # bootstrap["specs"] = [
+        #     f"{bootstrap_spec} languages=c,c++",
+        #     "squashfs default_compression=zstd",
+        # ]
+        # bootstrap["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
+        # compilers["bootstrap"] = bootstrap
 
         gcc = {}
         gcc["packages"] = {
@@ -459,7 +459,7 @@ def generate_compiler_specs(self, raw):
             },
         }
         gcc["specs"] = raw["gcc"]["specs"]
-        gcc["requires"] = bootstrap_spec
+        # gcc["requires"] = bootstrap_spec
         gcc["exclude_from_cache"] = ["cuda", "nvhpc", "perl"]
         compilers["gcc"] = gcc
         if raw["llvm"] is not None:

stackinator/templates/Makefile.compilers

@@ -41,14 +41,15 @@ all:{% for compiler in compilers %} {{ compiler }}/generated/build_cache{% endfo
 
 {% endif %}
 {% endfor %}
-# Configure dependencies between compilers
-gcc/compilers.yaml: bootstrap/generated/env
-	$(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./bootstrap find --format '{prefix}' {{ compilers.gcc.requires }}))
+# # Configure dependencies between compilers
+# # TODO: remove this and write compilers.yaml from cluster config
+# gcc/compilers.yaml: bootstrap/generated/env
+# 	$(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./bootstrap find --format '{prefix}' {{ compilers.gcc.requires }}))
 
-{% if compilers.llvm %}
-llvm/compilers.yaml: gcc/generated/env
-	$(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./gcc find --format '{prefix}' {{ compilers.llvm.requires }}))
-{% endif %}
+# {% if compilers.llvm %}
+# llvm/compilers.yaml: gcc/generated/env
+# 	$(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./gcc find --format '{prefix}' {{ compilers.llvm.requires }}))
+# {% endif %}
 
 
 include ../Make.inc
@@ -57,11 +58,11 @@ include ../Make.inc
 # specify the order here by conditionally including them, when the dependent exists.
 ifeq (,$(filter clean,$(MAKECMDGOALS)))
 
-include bootstrap/Makefile
+# include bootstrap/Makefile
 
-ifneq (,$(wildcard bootstrap/Makefile))
-include gcc/Makefile
-endif
+# ifneq (,$(wildcard bootstrap/Makefile))
+# include gcc/Makefile
+# endif
 
 {% if compilers.llvm %}
 ifneq (,$(wildcard gcc/Makefile))

stackinator/templates/Makefile.generate-config

@@ -3,10 +3,6 @@ include ../Make.user
 CONFIG_DIR = $(STORE)/config
 MODULE_DIR = $(BUILD_ROOT)/modules
 
-# These will be the prefixes of the GCCs, LLVMs and NVHPCs in the respective environments.
-ALL_COMPILER_PREFIXES ={% for compiler in all_compilers %} $$($(SPACK_HELPER) -e ../compilers/{{ compiler }} find --format='{prefix}' gcc llvm nvhpc){% endfor %}
-
-
 COMPILER_PREFIXES ={% for compiler in release_compilers %} $$($(SPACK_HELPER) -e ../compilers/{{ compiler }} find --format='{prefix}' gcc llvm nvhpc){% endfor %}
 
 

stackinator/templates/compilers.bootstrap.spack.yaml

@@ -2,7 +2,6 @@ spack:
   include:
   - packages.yaml
   - config.yaml
-  - compilers.yaml
   specs:
 {% for spec in config.specs %}
   - {{ spec }}

stackinator/templates/compilers.gcc.spack.yaml

@@ -2,7 +2,6 @@ spack:
   include:
   - packages.yaml
   - config.yaml
-  - compilers.yaml
   specs:
 {% for spec in config.specs %}
   - {{ spec }}