try dynamic max_threads #356

openhpc · Dec 30, 2016 · 9696ad8 · 9696ad8
1 parent 15f11a0
commit 9696ad8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/tests/perf-tools/tau/tests/Makefile.am b/tests/perf-tools/tau/tests/Makefile.am
@@ -5,7 +5,11 @@ TESTS_ENVIRONMENT = BATS_NO_SUMMARY=1
 #SUBDIRS = tbb
 #endif
 
-check_PROGRAMS          = CXX_mpi_test
+check_PROGRAMS          = get_max_threads
+get_max_threads_CFLAGS  = -fopenmp $(AM_CFLAGS)
+get_max_threads_SOURCES = get_max_threads.c
+
+check_PROGRAMS         += CXX_mpi_test
 CXX_mpi_test_LDFLAGS    = $(LDFLAGS)
 CXX_mpi_test_SOURCES    = CXX_mpi_test.cpp
 
@@ -18,8 +22,6 @@ C_mpi_test_LDFLAGS      = $(LDFLAGS)
 C_mpi_test_SOURCES      = C_mpi_test.c
 
 check_PROGRAMS         += C_omp_test
-#C_omp_test_CFLAGS       = "-O0 -g "
-C_omp_test_CC           = "taucc -fopenmp"
 C_omp_test_LDFLAGS      = $(LDFLAGS)
 C_omp_test_SOURCES      = C_omp_test.c
 

diff --git a/tests/perf-tools/tau/tests/get_max_threads.c b/tests/perf-tools/tau/tests/get_max_threads.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <omp.h>
+
+int main(int argc, char ** argv)
+{
+  int max_threads = omp_get_max_threads();
+
+  printf("%d\n", max_threads);
+
+  return 0;
+}
diff --git a/tests/perf-tools/tau/tests/rm_execution b/tests/perf-tools/tau/tests/rm_execution
@@ -14,7 +14,9 @@ rm=$RESOURCE_MANAGER
 NODES=2
 TASKS=8
 ARGS=8
+
 export TAU_TRACE=0 TAU_CALLPATH=0 TAU_PROFILE=1 TAU_METRICS=GET_TIME_OF_DAY:PAPI_L1_DCM:PAPI_LD_INS
+unset OMP_NUM_THREADS
 
 
 @test "[libs/TAU] MPI C binary runs under resource manager ($rm/$LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" {