From 971c0679ca1b418b9dcb083511f77ac108ab004b Mon Sep 17 00:00:00 2001
From: Jakub Kropacek <jakub.kropacek@vsb.cz>
Date: Thu, 18 Aug 2022 11:10:10 +0200
Subject: [PATCH] 	modified:  
 i/impi/impi-2021.6.0-intel-compilers-2022.1.0.eb 	new file:  
 i/intel-compilers/intel-compilers-2022.1.0.eb

---
 .../impi-2021.6.0-intel-compilers-2022.1.0.eb | 25 +++--
 i/intel-compilers/intel-compilers-2022.1.0.eb | 98 +++++++++++++++++++
 2 files changed, 116 insertions(+), 7 deletions(-)
 create mode 100644 i/intel-compilers/intel-compilers-2022.1.0.eb

diff --git a/i/impi/impi-2021.6.0-intel-compilers-2022.1.0.eb b/i/impi/impi-2021.6.0-intel-compilers-2022.1.0.eb
index d42373fa..ac026e96 100644
--- a/i/impi/impi-2021.6.0-intel-compilers-2022.1.0.eb
+++ b/i/impi/impi-2021.6.0-intel-compilers-2022.1.0.eb
@@ -16,14 +16,25 @@ checksums = ['e85db63788c434d43c1378e5e2bf7927a75d11aee8e6b78ee0d933da920977a6']
 
 dependencies = [('UCX', '1.12.1')]
 
+accept_eula = True
+
 modextravars = {
-    'I_MPI_OFI_PROVIDER': 'MLX',
-    'FI_PROVIDER': 'verbs',
-    'I_MPI_CC' : 'icc',
-    'I_MPI_CXX': 'icpc',
-    'I_MPI_F77': 'ifort',
-    'I_MPI_F90': 'ifort',
-    'I_MPI_FC': 'ifort',
+    "I_MPI_OFI_PROVIDER": "MLX",
+    "FI_PROVIDER": "verbs",
+    "I_MPI_CC": "icc",
+    "I_MPI_CXX": "icpc",
+    "I_MPI_F77": "ifort",
+    "I_MPI_F90": "ifort",
+    "I_MPI_FC": "ifort",
+    "I_MPI_HYDRA_BOOTSTRAP": "ssh",
+}
+
+modaliases = {
+    "mpigcc": "mpigcc -cc=gcc",
+    "mpigxx": "mpigxx -cxx=g++",
+    "mpiicc": "mpiicc -cc=icc",
+    "mpiicpc":"mpiicpc -cxx=icpc",
+    "mpiifort": "mpiifort -f90=ifort",
 }
 
 moduleclass = 'mpi'
diff --git a/i/intel-compilers/intel-compilers-2022.1.0.eb b/i/intel-compilers/intel-compilers-2022.1.0.eb
new file mode 100644
index 00000000..f26bdd0b
--- /dev/null
+++ b/i/intel-compilers/intel-compilers-2022.1.0.eb
@@ -0,0 +1,98 @@
+# IT4Innovations 2022
+# JK
+
+name = 'intel-compilers'
+version = '2022.1.0'
+
+homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/hpc-toolkit.html'
+description = "Intel C, C++ & Fortran compilers (classic and oneAPI)"
+
+toolchain = SYSTEM
+
+# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
+sources = [
+    {
+        'source_urls': ['https://registrationcenter-download.intel.com/akdlm/irc_nas/18717/'],
+        'filename': 'l_dpcpp-cpp-compiler_p_%(version)s.137_offline.sh',
+    },
+    {
+        'source_urls': ['https://registrationcenter-download.intel.com/akdlm/irc_nas/18703/'],
+        'filename': 'l_fortran-compiler_p_%(version)s.134_offline.sh',
+    },
+]
+checksums = [
+    # l_dpcpp-cpp-compiler_p_2022.1.0.137_offline.sh
+    '1027819581ba820470f351abfc2b2658ff2684ed8da9ed0e722a45774a2541d6',
+    '583082abe54a657eb933ea4ba3e988eef892985316be13f3e23e18a3c9515020',  # l_fortran-compiler_p_2022.1.0.134_offline.sh
+]
+
+local_gccver = '11.3.0'
+dependencies = [
+    ('GCCcore', local_gccver),
+    ('binutils', '2.38', '', ('GCCcore', local_gccver)),
+]
+
+license_file = '/apps/licenses/intel/license.lic'
+accept_eula = True
+
+
+import os
+if os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
+   	modextravars = {
+		"DEBUGFLAGS": "-O0 -g",
+		"CC": "icc",
+		"CXX": "icpc",
+		"F77": "ifort",
+		"F90": "ifort",
+		"FC": "ifort",
+		"OPTFLAGS": "-O3 -fPIC -march=core-avx2",
+		"CXXFLAGS": "-O3 -fPIC -march=core-avx2",
+		"CFLAGS": "-O3 -fPIC -march=core-avx2",
+		"FCFLAGS": "-O3 -fPIC -march=core-avx2",
+		"FFLAGS": "-O3 -fPIC -march=core-avx2",
+		"EASYBUILD_OPTARCH": "march=core-avx2",
+	}
+elif os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+	modextravars = {
+                "CC": "icc",
+                "CXX": "icpc",
+                "F77": "ifort",
+                "F90": "ifort",
+                "FC": "ifort",
+		"OPTFLAGS": "-O3 -xHost -ip",
+	}
+elif os.environ.get("CLUSTERNAME") in ["CS"]:
+	if os.environ.get("MFLAGS") in ["avx2"]:
+        	modextravars = {
+                	"DEBUGFLAGS": "-O0 -g",
+                	"CC": "icc",
+                	"CXX": "icpc",
+                	"F77": "ifort",
+                	"F90": "ifort",
+                	"FC": "ifort",
+                	"OPTFLAGS": "-O3 -fPIC -march=core-avx2",
+                	"CXXFLAGS": "-O3 -fPIC -march=core-avx2",
+                	"CFLAGS": "-O3 -fPIC -march=core-avx2",
+                	"FCFLAGS": "-O3 -fPIC -march=core-avx2",
+                	"FFLAGS": "-O3 -fPIC -march=core-avx2",
+                	"EASYBUILD_OPTARCH": "march=core-avx2",
+	}
+	elif os.environ.get("MFLAGS") in ["avx512"]:
+		modextravars = {
+                	"DEBUGFLAGS": "-O0 -g",
+                	"CC": "icc",
+                	"CXX": "icpc",
+                	"F77": "ifort",
+                	"F90": "ifort",
+                	"FC": "ifort",
+                	"OPTFLAGS": "-O3 -fPIC -march=core-avx512",
+                	"CXXFLAGS": "-O3 -fPIC -march=core-avx512",
+                	"CFLAGS": "-O3 -fPIC -march=core-avx512",
+                	"FCFLAGS": "-O3 -fPIC -march=core-avx512",
+                	"FFLAGS": "-O3 -fPIC -march=core-avx512",
+                	"EASYBUILD_OPTARCH": "march=core-avx512",
+        	}
+
+#modextrapaths = {"INTEL_LICENSE_FILE": "/apps/licenses/intel/license.lic"} # fails if specified?
+
+moduleclass = 'compiler'