Update CI containers to oneAPI 2021.4.0

[alexxy/gromacs.git] / admin / containers / utility.py

diff --git a/admin/containers/utility.py b/admin/containers/utility.py
index 9ae31996817f03407230b70ede2844d6d0f500df..1843aacb51f1d39600afc6447345c4f57a6cf4bd 100644 (file)
--- a/admin/containers/utility.py
+++ b/admin/containers/utility.py
@@ -69,6 +69,7 @@ Authors:
     * Eric Irrgang <ericirrgang@gmail.com>
     * Joe Jordan <e.jjordan12@gmail.com>
     * Mark Abraham <mark.j.abraham@gmail.com>
+    * Gaurav Garg <gaugarg@nvidia.com>
 
 """
 
@@ -125,12 +126,15 @@ parser.add_argument('--hipsycl', type=str, nargs='?', default=None,
 parser.add_argument('--rocm', type=str, nargs='?', const='debian', default=None,
                     help='Select AMD compute engine version.')
 
-parser.add_argument('--intel-compute-runtime', type=str, nargs='?', default=None,
-                    help='Select Intel Compute Runtime version.')
+parser.add_argument('--intel-compute-runtime', action='store_true', default=False,
+                    help='Include Intel Compute Runtime.')
 
 parser.add_argument('--clfft', type=str, nargs='?', const='master', default=None,
                     help='Add external clFFT libraries to the build image')
 
+parser.add_argument('--heffte', type=str, nargs='?', default=None,
+                    help='Select heffte repository tag/commit/branch.')
+
 parser.add_argument('--doxygen', type=str, nargs='?', const='1.8.5', default=None,
                     help='Add doxygen environment for documentation builds. Also adds other requirements needed for final docs images.')
 
@@ -171,8 +175,8 @@ def image_name(configuration: argparse.Namespace) -> str:
             elements.append(gpusdk + '-' + version)
     if configuration.oneapi is not None:
         elements.append('oneapi-' + configuration.oneapi)
-    if configuration.intel_compute_runtime is not None:
-        elements.append('intel-' + configuration.intel_compute_runtime)
+    if configuration.intel_compute_runtime:
+        elements.append('intel-compute-runtime')
     if configuration.rocm is not None:
         if (configuration.rocm != 'debian'):
             elements.append('rocm-' + configuration.rocm)