From 9dfe0ab306a8e6ff3b05520318ad8a27a79be2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Tue, 26 May 2020 12:03:59 +0200
Subject: [PATCH] 	modified:   p/PGI/PGI-19.4-GCC-8.3.0-2.32-CUDA.eb 
 modified:   p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb 	modified:  
 p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb 	new file:  
 p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb 	modified:  
 p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb

---
 p/PGI/PGI-19.4-GCC-8.3.0-2.32-CUDA.eb         |  3 --
 p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb       |  4 +-
 .../PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb  |  4 +-
 p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb         | 44 +++++++++++++++++++
 p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb              |  3 +-
 5 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb

diff --git a/p/PGI/PGI-19.4-GCC-8.3.0-2.32-CUDA.eb b/p/PGI/PGI-19.4-GCC-8.3.0-2.32-CUDA.eb
index 1d12647f..130a39e3 100644
--- a/p/PGI/PGI-19.4-GCC-8.3.0-2.32-CUDA.eb
+++ b/p/PGI/PGI-19.4-GCC-8.3.0-2.32-CUDA.eb
@@ -22,9 +22,6 @@ dependencies = [
     ('CUDA', '10.0.130'),
 ]
 
-#configopts = 'export PGI_INSTALL_MPI=true && '
-#configopts += 'export PGI_INSTALL_NVIDIA=true && '
-
 install_nvidia = 'true'
 install_mpi = 'true'
 install_mpi_gpu = 'true'
diff --git a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
index 2032c36e..d7c9c4a4 100644
--- a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
+++ b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
@@ -21,7 +21,9 @@ dependencies = [
     ('gcccuda', '2019a'),
 ]
 
-configopts = 'export PGI_INSTALL_MPI=true &&'
+install_nvidia = 'true'
+install_mpi = 'true'
+install_mpi_gpu = 'true'
 
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
diff --git a/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb b/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
index a616e06b..f0bbcff0 100644
--- a/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
+++ b/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
@@ -21,7 +21,9 @@ dependencies = [
     ('CUDA', '10.1.243'),
 ]
 
-configopts = 'export PGI_INSTALL_MPI=true && export PGI_INSTALL_NVIDIA=true && '
+install_nvidia = 'true'
+install_mpi = 'true'
+install_mpi_gpu = 'true'
 
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
diff --git a/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb b/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb
new file mode 100644
index 00000000..361a37ed
--- /dev/null
+++ b/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb
@@ -0,0 +1,44 @@
+# IT4Innovations 2020
+# LK
+
+name = 'PGI'
+version = '20.1'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran local_compilers from The Portland Group - PGI"
+
+toolchain = SYSTEM
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
+
+local_local_gccver = '8.3.0'
+local_local_local_binutilsver = '2.32'
+versionsuffix = '-GCC-%s-%s' % (local_local_gccver, local_local_local_binutilsver)
+
+dependencies = [
+    ('GCCcore', local_local_gccver),
+    ('binutils', local_local_local_binutilsver, '', ('GCCcore', local_local_gccver)),
+    ('numactl', '2.0.12', '', ('GCCcore', local_local_gccver)),
+    ('CUDA', '10.2.89'),
+]
+
+install_nvidia = 'true'
+install_mpi = 'true'
+install_mpi_gpu = 'true'
+
+# license file
+license_file = '/apps/licenses/pgi/license.dat'
+
+modextravars = {
+     'PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/bin',
+     'LD_LIBRARY_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib',
+     'LIBRARY_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib',
+     'CPATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/include',
+     'MANPATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/share/man',
+     'PKG_CONFIG_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib/pkgconfig',
+     'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+     'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+     'OMPI_MCA_orte_base_help_aggregate': '0'
+}
+
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb b/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb
index 6aa22f12..bb9d53a2 100644
--- a/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb
+++ b/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb
@@ -1,4 +1,5 @@
 # IT4Innovations 2020
+# LK
 
 name = 'PGI'
 version = '20.1'
@@ -20,7 +21,7 @@ dependencies = [
     ('numactl', '2.0.12', '', ('GCCcore', local_local_gccver)),
 ]
 
-configopts = 'export PGI_INSTALL_MPI=true &&'
+install_mpi = 'true'
 
 # license file
 license_file = '/apps/licenses/pgi/license.dat'