Merge branch 'it4i-barbora'

n/NVHPC/NVHPC-20.11-CUDA-11.0-OpenMPI-4.0.5-test.eb → n/NVHPC/NVHPC-20.11-CUDA-11.0-OpenMPI-4.0.5-UCX-1.9.0.eb

-# JH 2020
+# IT4Innovations 2021
+# LK
+# upravit mpirun - LD_PRELOAD=$EBROOTUCX/lib/libucp.so.0:$EBROOTUCX/lib/libucs.so.0
 
 name = 'NVHPC'
 version = '20.11'
-versionsuffix = '-CUDA-11.0-OpenMPI-4.0.5-test'
+versionsuffix = '-CUDA-11.0-OpenMPI-4.0.5-UCX-1.9.0'
 
 homepage = 'https://developer.nvidia.com/hpc-sdk/'
 description = """C, C++ and Fortran compilers included with the NVIDIA HPC SDK (previously: PGI)"""
@@ -63,6 +65,9 @@ cuda_compute_capabilities = '7.0' #V100 GPU
 #   module_add_cuda = Yes       # Add NVHPC's bundled CUDA
 
 local_openmpi_path = "Linux_x86_64/%(version)s/comm_libs/openmpi4/openmpi-4.0.5"
+
+postinstallcmds = ['sed "s|\$MY_DIR|LD_PRELOAD=\$EBROOTUCX/lib/libucp.so.0:\$EBROOTUCX/lib/libucs.so.0 \$MY_DIR|" %(installdir)s/Linux_x86_64/20.11/comm_libs/openmpi4/openmpi-4.0.5/bin/mpirun -i']
+
 modextrapaths = {
      'PATH': "%s/bin" % (local_openmpi_path),
      'LD_LIBRARY_PATH': "%s/lib" % (local_openmpi_path),