cmake tweak

ecmwf-ifs · Nov 23, 2023 · ed3a97c · ed3a97c
1 parent 6510dd9
commit ed3a97c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,8 +31,9 @@ ecbuild_add_option( FEATURE MPI
 
 ecbuild_add_option( FEATURE PAPI
                     DESCRIPTION "Support for HW counters in drhook via PAPI"
-                    )
-
+		    REQUIRED_PACKAGES "OpenMP"
+		    )
+
 ecbuild_add_option( FEATURE FCKIT
                     DESCRIPTION "Support for fckit"
                     REQUIRED_PACKAGES "fckit QUIET" )

diff --git a/src/fiat/CMakeLists.txt b/src/fiat/CMakeLists.txt
@@ -86,12 +86,16 @@ else()
 endif()
 
 if( HAVE_OMP )
+
   target_link_libraries( fiat PRIVATE OpenMP::OpenMP_Fortran )
-  if( CMAKE_C_COMPILER_ID MATCHES Intel )
+  target_link_libraries( fiat PRIVATE OpenMP::OpenMP_C )
+
+  if( ${CMAKE_C_COMPILER_ID} MATCHES Intel )
     ecbuild_add_c_flags("-qopenmp"                                  NO_FAIL)
   else()
     ecbuild_add_c_flags("-fopenmp"                                  NO_FAIL)
   endif()
+
 endif()
 
 fiat_target_ignore_missing_symbols( TARGET fiat SYMBOLS

diff --git a/src/fiat/drhook/drhook.c b/src/fiat/drhook/drhook.c
@@ -4592,7 +4592,7 @@ c_drhook_print_(const int *ftnunitno,
 	    first_counter_is_cyc=1;
 	  {
 	    len =
-	      fprintf(fpcsv,"Routine,MPI Rank,ThreadId,Rank,%% Self Time,Cumul,Excl Time,Incl. Time,#Calls");
+	      fprintf(fpcsv,"Routine,MPI Rank,ThreadId,SelfRank,%% Self Time,Cumul,Excl Time,Incl. Time,#Calls");
 	    for (int c=0;c<drhook_papi_num_counters();c++)
 	      fprintf(fpcsv,",%s(excl)",drhook_papi_counter_name(c,1));
 	    for (int c=0;c<drhook_papi_num_counters();c++)

diff --git a/src/fiat/drhook/drhook_papi.c b/src/fiat/drhook/drhook_papi.c
@@ -14,13 +14,6 @@ int    drhook_papi_rank=0; /* C style! */
 size_t drhook_max_counter_name=0;
 
 /* hardwired for now */
-/* const char * hookCounters[ NPAPICNTRS ][2]= */
-/*   { */
-/*    {"PAPI_TOT_CYC","Cycles"}, */
-/*    {"PAPI_FP_OPS","FP Operations"}, */
-/*    {"PAPI_L2_DCM","L2 Miss"} */
-/*   }; */
-
 const char * hookCounters[ NPAPICNTRS ][2]=
   {
    {"PAPI_TOT_CYC","Cycles"},