Use semver

minhqdao · minhqdao · commit 4bb65d2b56b8 · 2024-07-29T01:17:01.000+05:30
diff --git a/.github/compat/compat.csv b/.github/compat/compat.csv
@@ -1,10 +1,10 @@
 compiler,gcc,gcc,gcc,gcc,gcc,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,lfortran,lfortran,lfortran,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
-version,10,11,12,13,9,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.10,2021.11,2021.12,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
+version,9,10,11,12,13,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,2021.10,2021.11,2021.12,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.3,23.5,23.7,23.9,23.11
 runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-macos-12,&check;,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,&check;,,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
-macos-13,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,,&check;,,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
-macos-14,,&check;,&check;,&check;,,,,,,,,,,,,,,,&check;,,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
-ubuntu-20.04,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
-ubuntu-22.04,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
-windows-2019,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,,
-windows-2022,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,,
+macos-12,&check;,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,,,,
+macos-13,,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,,,,
+macos-14,,,&check;,&check;,&check;,,,,,,,,,,,,,,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,,,,
+ubuntu-20.04,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
+ubuntu-22.04,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
+windows-2019,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,,,,,,,
+windows-2022,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,,,,,,,
diff --git a/.github/compat/wide_compat_reports.py b/.github/compat/wide_compat_reports.py
@@ -5,6 +5,7 @@
 
 from pathlib import Path
 import pandas as pd
+import semver
 import sys
 
 ip = Path(sys.argv[1])  # input file path
@@ -16,7 +17,7 @@
 # read long CSV
 df = pd.read_csv(ip)
 
-# pivot and sort
+# pivot and sort index by runner
 df = pd.pivot_table(
     df,
     index="runner",
@@ -26,6 +27,25 @@
     aggfunc="first",
 ).sort_values(by=["runner"])
 
+# group by compiler and sort by versions
+grouped_versions = {}
+for compiler in df.columns.get_level_values("compiler").unique():
+    versions = df.loc[:, (compiler,)].columns.get_level_values("version").unique()
+    # Parse and sort versions using semver
+    versions = sorted(
+        versions,
+        key=lambda x: semver.VersionInfo.parse(x, optional_minor_and_patch=True),
+    )
+    grouped_versions[compiler] = versions
+
+sorted_columns = []
+for compiler in grouped_versions:
+    sorted_columns.extend(
+        [(compiler, version) for version in grouped_versions[compiler]]
+    )
+
+df = df[sorted_columns]
+
 # write wide CSV
 df.to_csv(op)
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 pandas
-tabulate
+semver
+tabulate

-Original file line number
+Diff line change
@@ @@ -1,2 +1,3 @@ @@
 pandas
 -tabulate
 +semver
 +tabulate