From 71db71fa0cf32d93a75a53005ef790d8f34ecedb Mon Sep 17 00:00:00 2001
From: Jakub Kropacek <jakub.kropacek@vsb.cz>
Date: Thu, 2 Jun 2022 10:49:56 +0200
Subject: [PATCH] 	modified:   o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb 
 new file:   o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb.orig_20220602101917_508724 
 modified:   q/Qt5/Qt5-5.15.2-GCCcore-10.3.0.eb

---
 o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb         |  4 +-
 ...1-GCC-10.3.0.eb.orig_20220602101917_508724 | 65 +++++++++++++++++++
 q/Qt5/Qt5-5.15.2-GCCcore-10.3.0.eb            |  5 +-
 3 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb.orig_20220602101917_508724

diff --git a/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb b/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb
index 303fcbb0..2103e58f 100644
--- a/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb
@@ -35,14 +35,14 @@ postinstallcmds = [
     'echo "btl_openib_allow_ib = true" >> %(installdir)s/etc/openmpi-mca-params.conf',
 ]
 
-libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
 sanity_check_paths = {
     'files': [
         "bin/%s" %
         binfile for binfile in [
             "ompi_info", "opal_wrapper", "orterun"]] + [
                 "lib/lib%s.%s" %
-                (libfile, SHLIB_EXT) for libfile in libs] + [
+                (libfile, SHLIB_EXT) for libfile in local_libs] + [
                     "include/%s.h" %
                     x for x in [
                         "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], }
diff --git a/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb.orig_20220602101917_508724 b/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb.orig_20220602101917_508724
new file mode 100644
index 00000000..303fcbb0
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-4.1.1-GCC-10.3.0.eb.orig_20220602101917_508724
@@ -0,0 +1,65 @@
+# IT4Innovations 2021
+# LK
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '4.1.1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '10.3.0'}
+
+source_urls = ['https://github.com/open-mpi/ompi/archive/refs/tags/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('hwloc', '2.4.1'),
+    ('UCX', '1.10.0',),
+]
+
+preconfigopts = './autogen.pl && '
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--with-tm=/opt/pbs '  # Enable PBS
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+configopts += '--with-ucx=$EBROOTUCX '
+
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+postinstallcmds = [
+    'echo "# By default, for Open MPI 4.0 and later, infiniband ports on a device are not used by default." >> %(installdir)s/etc/openmpi-mca-params.conf',
+    'echo "btl_openib_allow_ib = true" >> %(installdir)s/etc/openmpi-mca-params.conf',
+]
+
+libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+    'files': [
+        "bin/%s" %
+        binfile for binfile in [
+            "ompi_info", "opal_wrapper", "orterun"]] + [
+                "lib/lib%s.%s" %
+                (libfile, SHLIB_EXT) for libfile in libs] + [
+                    "include/%s.h" %
+                    x for x in [
+                        "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], }
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {'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',
+   }
+elif os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+   }
+
+moduleclass = 'mpi'
diff --git a/q/Qt5/Qt5-5.15.2-GCCcore-10.3.0.eb b/q/Qt5/Qt5-5.15.2-GCCcore-10.3.0.eb
index c8f4a640..81fd3e05 100644
--- a/q/Qt5/Qt5-5.15.2-GCCcore-10.3.0.eb
+++ b/q/Qt5/Qt5-5.15.2-GCCcore-10.3.0.eb
@@ -1,3 +1,6 @@
+# IT4Innovations
+# JK LK 2022
+
 easyblock = 'EB_Qt'
 
 name = 'Qt5'
@@ -56,7 +59,7 @@ dependencies = [
     ('snappy', '1.1.8'),
     ('JasPer', '2.0.28'),
     ('bzip2', '1.0.8'),
-    ('OpenSSL', '1.1', '', True),
+    ('OpenSSL', '1.1.1k'),
 ]
 
 # qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)