Order the targets in available_software.py

.gitignore

@@ -1,3 +1,5 @@
 site/
 venv*
+scripts/available_software/__pycache__
+scripts/available_software/tests/__pycache__
 

docs/available_software/javascripts/populate_overview.js

@@ -43,7 +43,8 @@ function populate_overview(json_data) {
                         targets: "_all",
                         className: 'dt-body-center'
                     }
-                ]
+                ],
+                scrollX: true,
             });
             console.log(table)
 

docs/available_software/overview.md

@@ -7,26 +7,26 @@ This table gives an overview of all the available software in EESSI per specific
     <thead>
         <tr>
             <th rowspan="3">Name</th>
-            <th colspan="3">aarch64</th>
             <th colspan="7">x86_64</th>
+            <th colspan="3">aarch64</th>
         </tr>
         </tr>
-            <th colspan="3"></th>
             <th colspan="1"></th>
             <th colspan="3">amd</th>
             <th colspan="3">intel</th>
+            <th colspan="3"></th>
         </tr>
         <tr>
-            <th colspan="1">generic</th>
-            <th colspan="1">neoverse_n1</th>
-            <th colspan="1">neoverse_v1</th>
             <th colspan="1">generic</th>
             <th colspan="1">zen2</th>
             <th colspan="1">zen3</th>
             <th colspan="1">zen4</th>
             <th colspan="1">haswell</th>
             <th colspan="1">skylake_avx512</th>
             <th colspan="1">sapphirerapids</th>
+            <th colspan="1">generic</th>
+            <th colspan="1">neoverse_n1</th>
+            <th colspan="1">neoverse_v1</th>
         </tr>
     </thead>
 </table>

scripts/available_software/available_software.py

@@ -233,7 +233,33 @@ def modules_eessi() -> dict:
     if modulepath:
         module_unuse(modulepath)
 
-    targets = [t for t in targets_eessi() if not any(t.endswith(x) for x in EXCLUDE_CPU_TARGETS)]
+    targets = targets_eessi()
+
+    # Order targets
+    generic_target_x86_64 = []
+    generic_target_aarch64 = []
+    targets_x86_64 = []
+    targets_aarch64 = []
+    for target in targets:
+        t = target.split('/')
+        if t[7] == 'aarch64':
+            if t[-1] == "generic":
+                generic_target_aarch64.append(target)
+            else:
+                targets_aarch64.append(target)
+        elif t[7] == 'x86_64':
+            if t[-1] == "generic":
+                generic_target_x86_64.append(target)
+            else:
+                targets_x86_64.append(target)
+    ordered_targets = []
+    ordered_targets.extend(generic_target_x86_64)
+    ordered_targets.extend(np.sort(targets_x86_64))
+    ordered_targets.extend(generic_target_aarch64)
+    ordered_targets.extend(np.sort(targets_aarch64))
+
+    targets = [t for t in ordered_targets if not any(t.endswith(x) for x in EXCLUDE_CPU_TARGETS)]
+
     for target in targets:
         print(f"\t Collecting available modules for {target}... ", end="", flush=True)
         module_use(target + "/modules/all/")

scripts/available_software/tests/data/test_json_simple_sol.json

@@ -1 +1 @@
-{"time_generated":"dummy", "targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"], "modules": {"Markov": [1, 0], "cfd": [1, 1], "llm": [0, 1], "science": [1, 1]}}
+{"time_generated":"dummy", "targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"], "modules": {"Markov": [0, 1], "cfd": [1, 1], "llm": [1, 0], "science": [1, 1]}}

scripts/available_software/tests/data/test_json_simple_sol_detail.json

@@ -1 +1 @@
-{"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"], "software": {"cfd": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"], "versions": {"cfd/1.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}, "cfd/2.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}, "cfd/24": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}, "cfd/5.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}, "cfd/2.0afqsdf": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}, "cfd/3.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}}}, "Markov": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"], "versions": {"Markov/hidden-1.0.5": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "Markov/hidden-1.0.10": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}}}, "science": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"], "versions": {"science/5.3.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}, "science/7.2.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}}}, "llm": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"], "versions": {"llm/20230627": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}}}}, "time_generated": "Thu, 31 Aug 2023 at 14:00:22 CEST"}
+{"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"], "software": {"cfd": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"], "versions": {"cfd/1.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "cfd/2.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "cfd/24": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "cfd/5.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "cfd/2.0afqsdf": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "cfd/3.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}}}, "Markov": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"], "versions": {"Markov/hidden-1.0.5": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "Markov/hidden-1.0.10": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}}}, "science": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"], "versions": {"science/5.3.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}, "science/7.2.0": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2", "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"]}}}, "llm": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"], "versions": {"llm/20230627": {"targets": ["/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"]}}}}, "time_generated": "Thu, 31 Aug 2023 at 14:00:22 CEST"}

scripts/available_software/tests/data/test_md_simple_sol.md

@@ -2,9 +2,9 @@
 Overview Modules
 ================
 
-| |/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic|/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2|
+| |/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2|/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic|
 | :---: | :---: | :---: |
-|Markov|X| |
+|Markov| |X|
 |cfd|X|X|
-|llm| |X|
+|llm|X| |
 |science|X|X|

scripts/available_software/tests/data/test_md_template_detailed_science_sol.md

@@ -44,7 +44,7 @@ module load science/7.2.0
 
 *(This data was automatically generated on {{ generated_date }})*  
 
-| |aarch64/generic|x86_64/amd/zen2|
+| |x86_64/amd/zen2|aarch64/generic|
 | :---: | :---: | :---: |
 |science/7.2.0|x|x|
 |science/5.3.0|x|x|

scripts/available_software/tests/test_json.py

@@ -6,7 +6,7 @@
 import os
 import json
 
-GENERIC = "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"
+GENERIC_ARM = "/cvmfs/software.eessi.io/versions/2023.06/software/linux/aarch64/generic"
 ZEN2 = "/cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2"
 
 
@@ -39,11 +39,11 @@ def test_json_generate_simple(self):
         modules = modules_eessi()
         json_data = generate_json_overview_data(modules)
         assert len(json_data.keys()) == 3
-        assert list(json_data["targets"]) == [GENERIC, ZEN2]
+        assert list(json_data["targets"]) == [ZEN2, GENERIC_ARM]
         assert json_data["modules"] == {
-                "Markov": [1, 0],
+                "Markov": [0, 1],
                 "cfd": [1, 1],
-                "llm": [0, 1],
+                "llm": [1, 0],
                 "science": [1, 1]
             }