use tau compile and runtime wrappers (#356)

openhpc · Dec 20, 2016 · 3342569 · 3342569
1 parent 3964421
commit 3342569
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/tests/perf-tools/tau/configure.ac b/tests/perf-tools/tau/configure.ac
@@ -28,12 +28,21 @@ else
    AC_MSG_RESULT([yes])
 fi
 
+AC_MSG_CHECKING([for TAU_MAKEFILE environment variable])
+if test "x$TAU_MAKEFILE" = "x"; then
+   AC_MSG_RESULT([no])
+   echo
+   AC_ERROR([TAU_MAKEFILE not defined - please load tau environment.])
+else
+   AC_MSG_RESULT([yes])
+fi
+
 # set compilers to use MPI toolchain 
 
 OHPC_COMPILER_FAMILY
 
-CC=mpicc
-CXX=mpicxx
+CC=tau_cc.sh
+CXX=tau_cxx.sh
 FC=mpif90
 F77=mpif90
 

diff --git a/tests/perf-tools/tau/tests/rm_execution b/tests/perf-tools/tau/tests/rm_execution
@@ -20,7 +20,7 @@ ARGS=8
 	flunk "C_mpi_test binary does not exit"
     fi
 
-    run_mpi_binary ./C_mpi_test $ARGS $NODES $TASKS
+    run_mpi_binary "tau_exec ./C_mpi_test" $ARGS $NODES $TASKS
     assert_success
 }
 
@@ -38,7 +38,7 @@ ARGS=8
 	flunk "C_omp_test binary does not exit"
     fi
 
-    run_serial_binary ./C_omp_test
+    run_serial_binary "tau_exec ./C_omp_test"
     assert_success
 }
 
@@ -47,6 +47,6 @@ ARGS=8
 	flunk "F_test binary does not exit"
     fi
 
-    run_serial_binary ./F_test
+    run_serial_binary "tau_exec ./F_test"
     assert_success
 }
diff --git a/tests/perf-tools/tau/tests/run_CXX_mpi_test.sh b/tests/perf-tools/tau/tests/run_CXX_mpi_test.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./CXX_mpi_test 500 500 2 4 4
+tau_exec ./CXX_mpi_test 500 500 2 4 4