To stop generating entries for deprecated toolchains

bin/table_generator

@@ -33,13 +33,23 @@ d_toolchains = {
         'GCC+OpenMPI': ['gompi', 'gomkl'],
         # Don't change the order, intel-compilers and intel-para should be before intel!
         'Intel+ParaStationMPI': ['ipsmpi', 'intel-para'],
-        'Intel+OpenMPI': ['iompi', 'iomkl'],
-        'Intel+IntelMPI': ['iimpi', 'intel'],
         'NVHPC+ParaStationMPI': ['npsmpic'],
         'NVHPC+OpenMPI': ['nvompic'],
+        # Deprecated
+        #'Intel+OpenMPI': ['iompi', 'iomkl'],
+        #'Intel+IntelMPI': ['iimpi', 'intel'],
     }
 }
 
+# List of toolchains to be ignored (due to deprecation, mostly)
+ignored_toolchains = [
+    'iccifort',
+    'iompi',
+    'iomkl',
+    'iimpi',
+    'intel',
+]
+
 # List of packages to be ignored (due to deprecation, split in other
 # packages, consolidation or moved to a different toolchain)
 ignored_pkgs = [
@@ -153,8 +163,8 @@ def sw_loop(eb_files):
         else:
             toolchain = 'SYSTEM'
 
-        # Ignore it, since we will take intel-compilers
-        if toolchain == 'iccifort':
+        # Ignore it
+        if toolchain in ignored_toolchains:
             continue
 
         inject(sw_dict, eb_name, toolchain)
@@ -308,12 +318,13 @@ def table_generator(sw_dict, acls, table_type):
             'gomkl': 1,
             'ipsmpi': 2,
             'intel-para': 2,
-            'iompi': 3,
-            'iomkl': 3,
-            'iimpi': 4,
-            'intel': 4,
-            'npsmpic': 5,
-            'nvompic': 6
+            'npsmpic': 3,
+            'nvompic': 4
+            # Deprecated
+            # 'iompi': 3,
+            # 'iomkl': 3,
+            # 'iimpi': 4,
+            # 'intel': 4,
         }
     else:
         table.update({'Packages': d_toolchains[table_type]})