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 f8f8b8ce721f65396a67a77b671860cdec738c4c..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>
 
 """
 
@@ -86,7 +87,7 @@ parsers for tools.
     Instead, inherit from it with the *parents* argument to :py:class:`argparse.ArgumentParser`
 """
 
-parser.add_argument('--cmake', nargs='*', type=str, default=['3.16.3', '3.17.2', '3.18.4'], # new minimum required versions
+parser.add_argument('--cmake', nargs='*', type=str, default=['3.16.3', '3.17.2', '3.18.4', '3.21.2'], # new minimum required versions
                     help='Selection of CMake version to provide to base image')
 
 compiler_group = parser.add_mutually_exclusive_group()
@@ -122,17 +123,23 @@ parser.add_argument('--tsan', type=str, nargs='?', const='llvm', default=None,
 parser.add_argument('--hipsycl', type=str, nargs='?', default=None,
                     help='Select hipSYCL repository tag/commit/branch.')
 
-parser.add_argument('--intel-compute-runtime', type=str, nargs='?', default=None,
-                    help='Select Intel Compute Runtime version.')
+parser.add_argument('--rocm', type=str, nargs='?', const='debian', default=None,
+                    help='Select AMD compute engine 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.')
 
 # Supported Python versions for maintained branches.
-_python_versions = ['3.6.10', '3.7.7', '3.8.2', '3.9.1']
+_python_versions = ['3.7.7', '3.8.2', '3.9.1']
 parser.add_argument('--venvs', nargs='*', type=str, default=_python_versions,
                     help='List of Python versions ("major.minor.patch") for which to install venvs. '
                          'Default: {}'.format(' '.join(_python_versions)))
@@ -168,8 +175,11 @@ 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)
 
     # Check for special cases
     # The following attribute keys indicate the image is built for the named