Add a fortran-rt virtual for all Fortran runtimes

alalazo · alalazo · commit 661f908a4cbc · 2024-01-22T22:49:50.000+01:00
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
@@ -24,6 +24,7 @@ packages:
       elf: [elfutils]
       fftw-api: [fftw, amdfftw]
       flame: [libflame, amdlibflame]
+      fortran-rt: [gcc-runtime, intel-oneapi-runtime]
       fuse: [libfuse]
       gfortran: [gcc-runtime]
       gl: [glx, osmesa]
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py
@@ -2645,8 +2645,12 @@ def setup(
         node_counter = _create_counter(specs, tests=self.tests)
         self.possible_virtuals = node_counter.possible_virtuals()
         self.pkgs = node_counter.possible_dependencies()
+
+        # TODO: unify this under an abstract operation
         self.possible_virtuals.add("gfortran")
         self.possible_virtuals.add("ifcore")
+        self.possible_virtuals.add("fortran-rt")
+
         runtimes = spack.repo.PATH.packages_with_tags("runtime")
         self.pkgs.update(set(runtimes))
 
diff --git a/lib/spack/spack/solver/display.lp b/lib/spack/spack/solver/display.lp
@@ -52,3 +52,4 @@
 % debug
 possible_in_link_run("gfortran").
 possible_in_link_run("ifcore").
+possible_in_link_run("fortran-rt").
diff --git a/var/spack/repos/builtin/packages/gcc-runtime/package.py b/var/spack/repos/builtin/packages/gcc-runtime/package.py
@@ -48,6 +48,7 @@ class GccRuntime(Package):
     ]
 
     # libgfortran ABI
+    provides("fortran-rt", "gfortran")
     provides("gfortran@3", when="%gcc@:6")
     provides("gfortran@4", when="%gcc@7")
     provides("gfortran@5", when="%gcc@8:")
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
@@ -1147,13 +1147,14 @@ def runtime_constraints(cls, *, compiler, pkg):
         elif compiler.spec.satisfies("gcc@7"):
             gfortran_str = "gfortran@4"
 
-        pkg("*").depends_on(
-            f"{gfortran_str}",
-            when=f"%{str(compiler.spec)}",
-            languages=["fortran"],
-            type="link",
-            description=f"Add a dependency on '{gfortran_str}' for nodes compiled with "
-            f"{str(compiler.spec)} and using the 'fortran' language",
-        )
+        for fortran_virtual in ("fortran-rt", gfortran_str):
+            pkg("*").depends_on(
+                fortran_virtual,
+                when=f"%{str(compiler.spec)}",
+                languages=["fortran"],
+                type="link",
+                description=f"Add a dependency on '{gfortran_str}' for nodes compiled with "
+                f"{str(compiler.spec)} and using the 'fortran' language",
+            )
         # The version of gcc-runtime is the same as the %gcc used to "compile" it
         pkg("gcc-runtime").requires(f"@={str(compiler.version)}", when=f"%{str(compiler.spec)}")
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
@@ -394,14 +394,15 @@ def runtime_constraints(cls, *, compiler, pkg):
             f"it depends on intel-oneapi-runtime@{str(compiler.version)}:",
         )
 
-        pkg("*").depends_on(
-            "ifcore@5",
-            when=f"%{str(compiler.spec)}",
-            languages=["fortran"],
-            type="link",
-            description=f"Add a dependency on 'ifcore' for nodes compiled with "
-            f"{str(compiler.spec)} and using the 'fortran' language",
-        )
+        for fortran_virtual in ("fortran-rt", "ifcore@5"):
+            pkg("*").depends_on(
+                fortran_virtual,
+                when=f"%{str(compiler.spec)}",
+                languages=["fortran"],
+                type="link",
+                description=f"Add a dependency on 'ifcore' for nodes compiled with "
+                f"{str(compiler.spec)} and using the 'fortran' language",
+            )
         # The version of gcc-runtime is the same as the %gcc used to "compile" it
         pkg("intel-oneapi-runtime").requires(
             f"@={str(compiler.version)}", when=f"%{str(compiler.spec)}"
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-runtime/package.py b/var/spack/repos/builtin/packages/intel-oneapi-runtime/package.py
@@ -34,7 +34,7 @@ class IntelOneapiRuntime(Package):
     ]
 
     # libifcore ABI
-    provides("ifcore@5", when="%oneapi@2021:")
+    provides("fortran-rt", "ifcore@5", when="%oneapi@2021:")
 
     def install(self, spec, prefix):
         if spec.platform in ["linux", "cray", "freebsd"]:

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ class GccRuntime(Package):`
`48`	`48`	`]`
`49`	`49`
`50`	`50`	`# libgfortran ABI`
	`51`	`+ provides("fortran-rt", "gfortran")`
`51`	`52`	`provides("gfortran@3", when="%gcc@:6")`
`52`	`53`	`provides("gfortran@4", when="%gcc@7")`
`53`	`54`	`provides("gfortran@5", when="%gcc@8:")`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class IntelOneapiRuntime(Package):`
`34`	`34`	`]`
`35`	`35`
`36`	`36`	`# libifcore ABI`
`37`		`- provides("ifcore@5", when="%oneapi@2021:")`
	`37`	`+ provides("fortran-rt", "ifcore@5", when="%oneapi@2021:")`
`38`	`38`
`39`	`39`	`def install(self, spec, prefix):`
`40`	`40`	`if spec.platform in ["linux", "cray", "freebsd"]:`