Merge pull request #2 from ACCESS-Hive/aidanheerdegen/issue1

Added feature to specify non-standard path prefix

Author: aidanheerdegen

find_compilers_packages.py

@@ -41,7 +41,8 @@ def parse_args(args):
     return parser.parse_args(args)
 
 
-def find_modules(modstring, defdict, type="compiler", specstring=None, variants="", verbose=False):
+def find_modules(modstring, defdict, type="compiler", specstring=None, variants="", 
+                 verbose=False, prefix=None):
     """
     Find all modules matching modstring, replace some values in defdict
     based on values from module to populate spack config files
@@ -63,7 +64,11 @@ def find_modules(modstring, defdict, type="compiler", specstring=None, variants=
         moddict["spec"] = f"{specstring}@{version}{variants}"
         moddict["modules"].append(mod)
         if type == "package":
-            moddict["prefix"] += mod
+            if prefix is not None:
+                path_prefix = prefix.format(mod=mod, version=version)
+            else:
+                path_prefix = mod
+            moddict["prefix"] += str(path_prefix)
             modlist.append(moddict)
         else:
             modlist.append({type: moddict})
@@ -172,6 +177,10 @@ def main(args):
         "modules": [],
     }
 
+    prefix_configure = {
+        "intel-mkl":  "intel-ct/{version}/mkl"
+    }
+
     for modstring, specstring in external_packages.items():
 
         # Load package if it already exists, otherwise an empty dict
@@ -184,6 +193,7 @@ def main(args):
             variants=variants.get(specstring, ""),
             type="package",
             verbose=args.verbose,
+            prefix=prefix_configure.get(modstring, None)
         )
 
         # Update package

packages.yaml

@@ -359,59 +359,59 @@ packages:
   intel-mkl:
     externals:
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2019.3.199
+      prefix: /apps/intel-ct/2019.3.199/mkl
       modules:
       - intel-mkl/2019.3.199
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2019.4.243
+      prefix: /apps/intel-ct/2019.4.243/mkl
       modules:
       - intel-mkl/2019.4.243
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2019.5.281
+      prefix: /apps/intel-ct/2019.5.281/mkl
       modules:
       - intel-mkl/2019.5.281
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2020.0.166
+      prefix: /apps/intel-ct/2020.0.166/mkl
       modules:
       - intel-mkl/2020.0.166
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2020.1.217
+      prefix: /apps/intel-ct/2020.1.217/mkl
       modules:
       - intel-mkl/2020.1.217
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2020.2.254
+      prefix: /apps/intel-ct/2020.2.254/mkl
       modules:
       - intel-mkl/2020.2.254
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2020.3.304
+      prefix: /apps/intel-ct/2020.3.304/mkl
       modules:
       - intel-mkl/2020.3.304
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2021.1.1
+      prefix: /apps/intel-ct/2021.1.1/mkl
       modules:
       - intel-mkl/2021.1.1
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2021.2.0
+      prefix: /apps/intel-ct/2021.2.0/mkl
       modules:
       - intel-mkl/2021.2.0
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2021.3.0
+      prefix: /apps/intel-ct/2021.3.0/mkl
       modules:
       - intel-mkl/2021.3.0
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2021.4.0
+      prefix: /apps/intel-ct/2021.4.0/mkl
       modules:
       - intel-mkl/2021.4.0
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2022.0.2
+      prefix: /apps/intel-ct/2022.0.2/mkl
       modules:
       - intel-mkl/2022.0.2
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2022.1.0
+      prefix: /apps/intel-ct/2022.1.0/mkl
       modules:
       - intel-mkl/2022.1.0
     - spec: [email protected]
-      prefix: /apps/intel-mkl/2022.2.0
+      prefix: /apps/intel-ct/2022.2.0/mkl
       modules:
       - intel-mkl/2022.2.0
     buildable: false