From 6891106a73d844e56661960b799dad0fe7bd9edd Mon Sep 17 00:00:00 2001
From: Germann Elsa Sylvia <germann_e@merlin-l-001.psi.ch>
Date: Fri, 12 Aug 2022 13:39:54 +0200
Subject: [PATCH] FIX: better module file generation

---
 env/merlin/sysconfigs/modules.yaml | 113 ++++++++++++++++-------------
 1 file changed, 61 insertions(+), 52 deletions(-)

diff --git a/env/merlin/sysconfigs/modules.yaml b/env/merlin/sysconfigs/modules.yaml
index 97d39af..b878304 100644
--- a/env/merlin/sysconfigs/modules.yaml
+++ b/env/merlin/sysconfigs/modules.yaml
@@ -1,61 +1,70 @@
-# -------------------------------------------------------------------------
-# This is the default configuration for Spack's module file generation.
-#
-# Settings here are versioned with Spack and are intended to provide
-# sensible defaults out of the box. Spack maintainers should edit this
-# file to keep it current.
-#
-# Users can override these settings by editing the following files.
-#
-# Per-spack-instance settings (overrides defaults):
-#   $SPACK_ROOT/etc/spack/modules.yaml
-#
-# Per-user settings (overrides default and site settings):
-#   ~/.spack/modules.yaml
-# -------------------------------------------------------------------------
+---
 modules:
-  # Paths to check when creating modules for all module sets
-  prefix_inspections:
-    bin:
-      - PATH
-    man:
-      - MANPATH
-    share/man:
-      - MANPATH
-    share/aclocal:
-      - ACLOCAL_PATH
-    lib/pkgconfig:
-      - PKG_CONFIG_PATH
-    lib64/pkgconfig:
-      - PKG_CONFIG_PATH
-    share/pkgconfig:
-      - PKG_CONFIG_PATH
-    '':
-      - CMAKE_PREFIX_PATH
-
-  # These are configurations for the module set named "default"
   default:
-    # Where to install modules
-    roots:
-     tcl: /afs/psi.ch/sys/spack-rhel7/modules
-    # What type of modules to use
     enable:
       - tcl
+    roots:
+      tcl: /afs/psi.ch/sys/spack-rhel7/modules
     tcl:
       all:
         autoload: direct
+        conflict:
+          - '{name}'
+        environment:
+          append_path:
+            PMODULES_LOADED_COMPILER: '{name}/{version}'
+          remove_path:
+            PMODULES_LOADED_COMPILER: '--APPMARKER--'
+          set:
+            ${PACKAGE}_DIR: '{prefix}'
+            ${PACKAGE}_HOME: '{prefix}'
+            ${PACKAGE}_INCLUDE_DIR: '{prefix}/include'
+            ${PACKAGE}_LIBRARY_DIR: '{prefix}/lib'
+            ${PACKAGE}_PREFIX: '{prefix}'
+            ${PACKAGE}_VERSION: '{version}'
+      hdf5+mpi:
+        environment:
+          set:
+            HDF5: '{name}'
+      hdf5~mpi:
+        environment:
+          set:
+            HDF5: '{name}_serial'
+      mpi:
+        environment:
+          set:
+            MPI: '{name}'
+            MPIEXEC: '{prefix}/bin/mpiexec'
+            MPIFC: '{prefix}/bin/mpif90'
+            MPIFORTRAN: '{prefix}bin/mpif90'
+            MPIRUN: '{prefix}/bin/mpirun'
+            MPI_VERSION: '{version}'
       projections:
-        all: '{name}/{version}/{compiler.name}/{compiler.version}/module'
         ^mpi: '{name}/{version}/{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/module'
-      gcc:
-        conflict:
-          - 'intel'
-          - 'nvhpc'
-      intel:
-        conflict:
-          - 'gcc'
-          - 'nvhpc'
-      nvhpc:
-        conflict:
-          - 'gcc'
-          - 'intel'
+        all: '{name}/{version}/{compiler.name}/{compiler.version}/module'
+  prefix_inspections:
+    '':
+      - CMAKE_PREFIX_PATH
+    bin:
+      - PATH
+    include:
+      - C_INCLUDE_PATH
+      - CPLUS_INCLUDE_PATH
+    lib:
+      - LIBRARY_PATH
+      - LD_LIBRARY_PATH
+    lib/pkgconfig:
+      - PKG_CONFIG_PATH
+    lib64:
+      - LIBRARY_PATH
+      - LD_LIBRARY_PATH
+    lib64/pkgconfig:
+      - PKG_CONFIG_PATH
+    man:
+      - MANPATH
+    share/aclocal:
+      - ACLOCAL_PATH
+    share/man:
+      - MANPATH
+    share/pkgconfig:
+      - PKG_CONFIG_PATH
\ No newline at end of file