Merge branch 'patch-3' into 'master'

Update Profiling-scorep-Vampir.md

See merge request !4

Profiling-scorep-Vampir.md

@@ -6,31 +6,24 @@ Score-P allows for detailed instrumentation of an application using CPU and/or G
 
 ### Modules
 
-Score-P is available both on JURECA and on JURON. But with different features and configurations.
-
-* JURECA
-    - Score-P for CUDA (via `Stages/Devel`)
-        + `module use /usr/local/software/jureca/OtherStages; module load Stages/Devel;`
-        + `module load GCC/5.4.0 CUDA/8.0.44 MVAPICH2/2.2-GDR`
-        + `module load Score-P/3.0-p1`
-    - Score-P for PGI 16.10
-        + *Currently unavailable; if needed, please talk to Andreas*
-    - Score-P for PGI 17.1 (via `Stages/Devel`)
-        + `module use /usr/local/software/jureca/OtherStages; module load Stages/Devel;`
-        + *Note: `nvcc` is currently not working as a target compiler for `scorep`; the CUDA support is unavailable (OpenACC should work, though)*
-    - Score-P for GCC
-        + `module load GCC/5.4.0 ParaStationMPI/5.1.5-1`
-        + `module load Score-P/3.0-p1`
-* JURON
-    - Score-P for CUDA
-        + `module load gcc/5.4.0 nvidia/cuda/8.0`
-        + `module load scorep/3.0-gcc5.4-ompi2.0.0-cuda8-papi5.5.0`
+Score-P is available both on JUWELS and on JURON. But with different features and configurations.
+
+* JUWELS
+    - Score-P for GCC + CUDA
+        + `module use /p/scratch/share/GPU-Hackathon/mf`
+        + `module load Score-P/5.0-gnu-mvapich-cuda`
+        + `module load CubeGUI` 
+    - Score-P for PGI 18.4
+        + `module use /p/scratch/share/GPU-Hackathon/mf`
+        + `module load Score-P/5.0-pgi-mvapich-cuda`
+        + `module load CubeGUI` 
+        + *Note: `nvcc` is currently not tested as a target compiler for `scorep`; the CUDA support might be unavailable (OpenACC should work, though)*
 
 ### How-to Score-P
 
 #### Compilation
 
-Score-P works easiest by prefixing the compilation command with `scorep`. Instead of calling `nvcc ARGS`, call `scorep nvcc ARGS`; instead of `pgfortran ALL`, call `scorep pgfortran ARGS`.
+Score-P works easiest by prefixing the compilation and linking command with `scorep`. Instead of calling `nvcc ARGS`, call `scorep nvcc ARGS`; instead of `pgfortran ALL`, call `scorep pgfortran ARGS`.
 
 Important flags to `scorep` for us:
 
@@ -89,18 +82,16 @@ flt     type max_buf[B] visits time[s] time[%] time/visit[us]  region
 
 ### Cube
 
-Cube is the *performance report explorer for Scalasca*, a GUI application which can be launched either on JURON or JURECA. It can also be downloaded as free software from [scalasca.org](http://www.scalasca.org/software/cube-4.x/download.html) and run locally to explore profiles.
-
-On JURON and JURECA, Cube comes with the respective Score-P module.
+Cube is the *performance report explorer for Scalasca*, a GUI application which can be launched either on JURON or JUWELS. It can also be downloaded as free software from [scalasca.org](http://www.scalasca.org/software/cube-4.x/download.html) and run locally to explore profiles.
 
 After importing a profile, Cube looks like this:
 
-![Cube](img/screenshot-cube--HQ.png)\ 
+![Cube](img/screenshot-cube--HQ.png)
 
 
 ### Vampir
 
-Vampir is installed on JURECA, available through the `Vampir` module: `module load Vampir`.
+Vampir is installed on JUWELS, available through the `Vampir` module: `module load Vampir`.
 
 Vampir is used to study trace files, generate them with Score-P by setting the environment variable `SCOREP_ENABLE_TRACING=true` prior to running your program.  
 If the environment variable is set, a `.otf2` trace file is placed into the Score-P result directory. Open it with `vampir`.