From f1749cf28ed01f0c8a174acc4d174c16106dff58 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: Wed, 15 May 2019 14:31:53 +0200
Subject: [PATCH] 	modified:   o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb 
 modified:   t/Trilinos/Trilinos-12.12.1-intel-2017c-Py-2.7.eb 	modified:  
 t/Trilinos/Trilinos-12.14.1-foss-2018a-Py-2.7.eb 	modified:  
 t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb 	new file:  
 v/Valgrind/Valgrind-3.15.0-foss-2017b.eb 	new file:  
 v/Valgrind/Valgrind-3.15.0-intel-2018.04.eb

---
 o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb     |  8 ++---
 .../Trilinos-12.12.1-intel-2017c-Py-2.7.eb    |  5 +++-
 .../Trilinos-12.14.1-foss-2018a-Py-2.7.eb     |  2 ++
 .../Trilinos-12.14.1-intel-2017c-Py-2.7.eb    |  3 ++
 v/Valgrind/Valgrind-3.15.0-foss-2017b.eb      | 29 +++++++++++++++++++
 v/Valgrind/Valgrind-3.15.0-intel-2018.04.eb   | 29 +++++++++++++++++++
 6 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 v/Valgrind/Valgrind-3.15.0-foss-2017b.eb
 create mode 100644 v/Valgrind/Valgrind-3.15.0-intel-2018.04.eb

diff --git a/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb
index bd5aaccd..e429507a 100644
--- a/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb
@@ -13,9 +13,9 @@ toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
 source_urls = ['https://github.com/open-mpi/ompi/archive/']
 sources = ['v4.0.0.tar.gz']
 
-builddependencies = [
-    ('Java', '1.8.0_144', '', True)
-]
+#builddependencies = [
+#    ('Java', '1.8.0_144', '', True)
+#]
 
 dependencies = [
     ('hwloc', '2.0.3'),
@@ -33,7 +33,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 # configopts += '--disable-dlopen '  # dont disable dlopen!
 # https://github.com/open-mpi/ompi/issues/3630
 configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
-configopts += '--enable-mpi-java '  # Java support RT#4090
+#configopts += '--enable-mpi-java '  # Java support RT#4090
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 
 # to enable SLURM integration (site-specific)
diff --git a/t/Trilinos/Trilinos-12.12.1-intel-2017c-Py-2.7.eb b/t/Trilinos/Trilinos-12.12.1-intel-2017c-Py-2.7.eb
index 249dc0e4..9abd9fd7 100644
--- a/t/Trilinos/Trilinos-12.12.1-intel-2017c-Py-2.7.eb
+++ b/t/Trilinos/Trilinos-12.12.1-intel-2017c-Py-2.7.eb
@@ -39,7 +39,7 @@ dependencies = [
     ('Py', '2.7', '', True),
     ('Boost', '1.68.0', versionsuffix),
     ('SCOTCH', '6.0.6'),
-    ('SuiteSparse', '5.4.0', '-ParMETIS-4.0.3'),
+    ('SuiteSparse', '5.4.0', '-METIS-5.1.0'),
     ('ParMETIS', '4.0.3'),
     ('netCDF', '4.6.1'),
     ('MATIO', '1.5.12', '', ('GCCcore', '6.3.0')),
@@ -55,6 +55,9 @@ skip_exts = ['TrilinosCouplings']
 preinstallopts = "cd %(builddir)s/trilinos-%(version)s-Source/packages/PyTrilinos/src/PyTrilinos && "
 preinstallopts += "python -m compileall -l -f . && cd - && "
 
+# RT#18666
+configopts = '-D Amesos_ENABLE_PARDISO=ON -D PARDISO_LIBRARY_DIRS="${EBROOTIMKL}/mkl/lib/intel64_lin" -D PARDISO_LIBRARY_NAMES="libmkl_rt.so"'
+
 # too parallel is too slow because of memory requirements (results in swapping), and may cause build/tests to fail
 # building with 20 cores seems to require about 100GB of memory (peak usage)
 maxparallel = 10
diff --git a/t/Trilinos/Trilinos-12.14.1-foss-2018a-Py-2.7.eb b/t/Trilinos/Trilinos-12.14.1-foss-2018a-Py-2.7.eb
index fa1270d9..59eb6b90 100644
--- a/t/Trilinos/Trilinos-12.14.1-foss-2018a-Py-2.7.eb
+++ b/t/Trilinos/Trilinos-12.14.1-foss-2018a-Py-2.7.eb
@@ -1,4 +1,6 @@
 # IT4Innovations 2019
+#
+# NOT WORKING!
 
 name = 'Trilinos'
 version = '12.14.1'
diff --git a/t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb b/t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb
index 7198560e..ee25844c 100644
--- a/t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb
+++ b/t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb
@@ -1,4 +1,7 @@
 # IT4Innovations 2019
+#
+# NOT WORKING!
+
 
 name = 'Trilinos'
 version = '12.14.1'
diff --git a/v/Valgrind/Valgrind-3.15.0-foss-2017b.eb b/v/Valgrind/Valgrind-3.15.0-foss-2017b.eb
new file mode 100644
index 00000000..1410fc6d
--- /dev/null
+++ b/v/Valgrind/Valgrind-3.15.0-foss-2017b.eb
@@ -0,0 +1,29 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'Valgrind'
+version = "3.15.0"
+
+homepage = 'http://valgrind.org/downloads/'
+description = "Valgrind: Debugging and profiling tools"
+
+toolchain = {'name': 'foss', 'version': '2017b'}
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://sourceware.org/pub/valgrind/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+configopts = ' --with-mpicc="$MPICC"'
+
+binaries = [
+    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
+    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in binaries],
+    'dirs': []
+}
+
+moduleclass = 'debugger'
diff --git a/v/Valgrind/Valgrind-3.15.0-intel-2018.04.eb b/v/Valgrind/Valgrind-3.15.0-intel-2018.04.eb
new file mode 100644
index 00000000..af7b1efc
--- /dev/null
+++ b/v/Valgrind/Valgrind-3.15.0-intel-2018.04.eb
@@ -0,0 +1,29 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'Valgrind'
+version = "3.15.0"
+
+homepage = 'http://valgrind.org/downloads/'
+description = "Valgrind: Debugging and profiling tools"
+
+toolchain = {'name': 'intel', 'version': '2018.04'}
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://sourceware.org/pub/valgrind/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+configopts = ' --with-mpicc="$MPICC"'
+
+binaries = [
+    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
+    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in binaries],
+    'dirs': []
+}
+
+moduleclass = 'debugger'