modified: c/CubeGUI/CubeGUI-4.4.3-gompi-2019.03.eb

modified:   c/CubeGUI/CubeGUI-4.4.3-intel-2017a.eb
	modified:   c/CubeGUI/CubeGUI-4.4.3-intel-2018a.eb
	modified:   c/CubeGUI/CubeGUI-4.4.3-intel-2019.02.eb
	modified:   c/CubeLib/CubeLib-4.4.3-gompi-2019.03.eb
	modified:   c/CubeLib/CubeLib-4.4.3-intel-2017a.eb
	modified:   c/CubeLib/CubeLib-4.4.3-intel-2018a.eb
	modified:   c/CubeLib/CubeLib-4.4.3-intel-2019.02.eb
	modified:   c/CubeW/CubeW-4.4.2-gompi-2019.03.eb
	modified:   c/CubeW/CubeW-4.4.2-intel-2017a.eb
	modified:   c/CubeW/CubeW-4.4.2-intel-2018a.eb
	modified:   c/CubeW/CubeW-4.4.2-intel-2019.02.eb
	modified:   r/R/R-3.5.3-intel-2017a.eb
	new file:   s/Score-P/Score-P-5.0-gompi-2019.03.eb
	new file:   s/Score-P/Score-P-5.0-intel-2017a.eb
	new file:   s/Score-P/Score-P-5.0-intel-2018a.eb
	new file:   s/Score-P/Score-P-5.0-intel-2019.02.eb
	modified:   t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb

c/CubeGUI/CubeGUI-4.4.3-gompi-2019.03.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'gompi', 'version': '2019.03'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubegui-%(version)s.tar.gz']

c/CubeGUI/CubeGUI-4.4.3-intel-2017a.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2017a'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubegui-%(version)s.tar.gz']

c/CubeGUI/CubeGUI-4.4.3-intel-2018a.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2018a'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubegui-%(version)s.tar.gz']

c/CubeGUI/CubeGUI-4.4.3-intel-2019.02.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2019.02'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubegui-%(version)s.tar.gz']

c/CubeLib/CubeLib-4.4.3-gompi-2019.03.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'gompi', 'version': '2019.03'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubelib-%(version)s.tar.gz']

c/CubeLib/CubeLib-4.4.3-intel-2017a.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2017a'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubelib-%(version)s.tar.gz']

c/CubeLib/CubeLib-4.4.3-intel-2018a.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2018a'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubelib-%(version)s.tar.gz']

c/CubeLib/CubeLib-4.4.3-intel-2019.02.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2019.02'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubelib-%(version)s.tar.gz']

c/CubeW/CubeW-4.4.2-gompi-2019.03.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'gompi', 'version': '2019.03'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubew-%(version)s.tar.gz']

c/CubeW/CubeW-4.4.2-intel-2017a.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2017a'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubew-%(version)s.tar.gz']

c/CubeW/CubeW-4.4.2-intel-2018a.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2018a'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubew-%(version)s.tar.gz']

c/CubeW/CubeW-4.4.2-intel-2019.02.eb

@@ -13,7 +13,7 @@ description = """Cube, which is used as performance report explorer for Scalasca
  can be collapsed or expanded to achieve the desired level of granularity."""
 
 toolchain = {'name': 'intel', 'version': '2019.02'}
-toolchainopts = {'optarch': False}
+toolchainopts = {'optarch': False, 'pic': True}
 
 source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/']
 sources = ['cubew-%(version)s.tar.gz']

r/R/R-3.5.3-intel-2017a.eb

@@ -2113,6 +2113,11 @@ exts_list = [
     ('Rsolnp', '1.16'),
     ('Repitools', '1.28.0'),
     ('rtracklayer', '1.42.2'),
+    # pbdMPI
+    ('float', '0.2-2'),
+    ('pbdMPI', '0.3-9', {
+        'installopts': '--configure-args="--with-mpi-type=INTELMPI"',
+    }), #R CMD INSTALL pbdMPI_0.3-9.tar.gz --configure-args="--with-mpi-type=INTELMPI"
 ]
 
 moduleclass = 'lang'

s/Score-P/Score-P-5.0-gompi-2019.03.eb

@@ -0,0 +1,44 @@
+# IT4Innovations 2019
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '5.0'
+
+homepage = 'http://www.score-p.org'
+description = """The Score-P measurement infrastructure is a highly scalable and
+ easy-to-use tool suite for profiling, event tracing, and online analysis of HPC
+ applications."""
+
+toolchain = {'name': 'gompi', 'version': '2019.03'}
+
+source_urls = ['https://www.vi-hps.org/cms/upload/packages/scorep/']
+sources = ['scorep-%(version)s.tar.gz']
+
+dependencies = [
+    ('Cube', '4.4.3'),
+    ('OPARI2', '2.0.2', '', True),
+    ('OTF2', '2.1', '', True),
+    ('PAPI', '5.5.1', '', True),
+    ('PDT', '3.24', '', True),
+]
+
+configopts = '--enable-shared'
+
+sanity_check_paths = {
+    'files': [
+        "bin/scorep",
+        "include/scorep/SCOREP_User.h",
+        ("lib/libscorep_adapter_mpi_event.a",
+         "lib64/libscorep_adapter_mpi_event.a"),
+        ("lib/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT,
+         "lib64/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by Cube GUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'

s/Score-P/Score-P-5.0-intel-2017a.eb

@@ -0,0 +1,44 @@
+# IT4Innovations 2019
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '5.0'
+
+homepage = 'http://www.score-p.org'
+description = """The Score-P measurement infrastructure is a highly scalable and
+ easy-to-use tool suite for profiling, event tracing, and online analysis of HPC
+ applications."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+source_urls = ['https://www.vi-hps.org/cms/upload/packages/scorep/']
+sources = ['scorep-%(version)s.tar.gz']
+
+dependencies = [
+    ('Cube', '4.4.3'),
+    ('OPARI2', '2.0.2', '', True),
+    ('OTF2', '2.1', '', True),
+    ('PAPI', '5.5.1', '', True),
+    ('PDT', '3.24', '', True),
+]
+
+configopts = '--enable-shared'
+
+sanity_check_paths = {
+    'files': [
+        "bin/scorep",
+        "include/scorep/SCOREP_User.h",
+        ("lib/libscorep_adapter_mpi_event.a",
+         "lib64/libscorep_adapter_mpi_event.a"),
+        ("lib/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT,
+         "lib64/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by Cube GUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'

s/Score-P/Score-P-5.0-intel-2018a.eb

@@ -0,0 +1,44 @@
+# IT4Innovations 2019
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '5.0'
+
+homepage = 'http://www.score-p.org'
+description = """The Score-P measurement infrastructure is a highly scalable and
+ easy-to-use tool suite for profiling, event tracing, and online analysis of HPC
+ applications."""
+
+toolchain = {'name': 'intel', 'version': '2018a'}
+
+source_urls = ['https://www.vi-hps.org/cms/upload/packages/scorep/']
+sources = ['scorep-%(version)s.tar.gz']
+
+dependencies = [
+    ('Cube', '4.4.3'),
+    ('OPARI2', '2.0.2', '', True),
+    ('OTF2', '2.1', '', True),
+    ('PAPI', '5.5.1', '', True),
+    ('PDT', '3.24', '', True),
+]
+
+configopts = '--enable-shared'
+
+sanity_check_paths = {
+    'files': [
+        "bin/scorep",
+        "include/scorep/SCOREP_User.h",
+        ("lib/libscorep_adapter_mpi_event.a",
+         "lib64/libscorep_adapter_mpi_event.a"),
+        ("lib/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT,
+         "lib64/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by Cube GUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'

s/Score-P/Score-P-5.0-intel-2019.02.eb

@@ -0,0 +1,44 @@
+# IT4Innovations 2019
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '5.0'
+
+homepage = 'http://www.score-p.org'
+description = """The Score-P measurement infrastructure is a highly scalable and
+ easy-to-use tool suite for profiling, event tracing, and online analysis of HPC
+ applications."""
+
+toolchain = {'name': 'intel', 'version': '2019.02'}
+
+source_urls = ['https://www.vi-hps.org/cms/upload/packages/scorep/']
+sources = ['scorep-%(version)s.tar.gz']
+
+dependencies = [
+    ('Cube', '4.4.3'),
+    ('OPARI2', '2.0.2', '', True),
+    ('OTF2', '2.1', '', True),
+    ('PAPI', '5.5.1', '', True),
+    ('PDT', '3.24', '', True),
+]
+
+configopts = '--enable-shared'
+
+sanity_check_paths = {
+    'files': [
+        "bin/scorep",
+        "include/scorep/SCOREP_User.h",
+        ("lib/libscorep_adapter_mpi_event.a",
+         "lib64/libscorep_adapter_mpi_event.a"),
+        ("lib/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT,
+         "lib64/libscorep_adapter_mpi_event.%s" %
+         SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by Cube GUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'

t/Trilinos/Trilinos-12.14.1-intel-2017c-Py-2.7.eb

@@ -46,7 +46,8 @@ dependencies = [
 skip_exts = ['TrilinosCouplings']
 
 
-prebuildopts = "find packages/amesos2/test/solvers -type f -exec sed -i.bak 's/-lifcoremt_pic/-lifcoremt_pic -lcamd -lccolamd/g' {} + && "
+prebuildopts =  "find packages/amesos2/test/solvers -type f -exec sed -i.bak 's/-lifcoremt_pic/-lifcoremt_pic -lcamd -lccolamd/g' {} + && "
+prebuildopts += "find packages/amesos/test -type f -exec sed -i.bak 's/-lifcoremt_pic/-lifcoremt_pic -lcamd -lccolamd -lmetis/g' {} + && "
 
 # workaround for Teuchos.pyc not being found during "make install"
 # see https://github.com/trilinos/Trilinos/issues/1749