DrHook Static Linking Fixes

AUTHORS

@@ -1,6 +1,7 @@
 Authors and Contributors
 ========================
 
+- A. Beggs (ECMWF)
 - W. Deconinck (ECMWF)
 - D. Dent (ECMWF)
 - R. El Khatib (Meteo France)

CMakeLists.txt

@@ -118,6 +118,17 @@ set( fiat_REQUIRES_PRIVATE_DEPENDENCIES FALSE )
 get_target_property( target_build_type fiat TYPE )
 if( target_build_type STREQUAL STATIC_LIBRARY OR TARGET fiat-static )
   set( fiat_REQUIRES_PRIVATE_DEPENDENCIES TRUE )
+  # Make find_package modules available to downstream packages
+  foreach( find_module
+    FindNVTX.cmake
+    FindROCTX.cmake
+    FindPAPI.cmake )
+    ecbuild_warn_var(find_module)
+    if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${find_module}")
+      execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/cmake/${find_module}" "${CMAKE_CURRENT_BINARY_DIR}/${find_module}" )
+    endif()
+    install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/${find_module}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/fiat" )
+  endforeach()
 endif()
 
 ecbuild_install_project( NAME fiat )

cmake/FindROCTX.cmake

@@ -6,22 +6,21 @@
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
 
-set( HAVE_ROCPROFILER_SDK_ROCTX 0)	
+set( HAVE_ROCPROFILER_SDK_ROCTX 0)
 set( ROCTX_REQUIRED_VARS ROCTX_LIBRARIES )
 
-find_package( rocprofiler-sdk-roctx CONFIG PATHS ${ROCM_PATH}/lib )
-if( NOT rocprofiler-sdk-roctx_FOUND )
-    ecbuild_info( "rocprofiler-sdk-roctx libraries not found" )
-    if ( NOT DEFINED ROCM_PATH OR NOT ROCM_PATH_FOUND )
-        find_path(
+if ( NOT DEFINED ROCM_PATH OR NOT ROCM_PATH_FOUND )
+    find_path(
             ROCM_PATH
-            NAMES include/roctracer/roctx.h
+            NAMES include/roctracer/roctx.h include/rocprofiler-sdk-roctx/roctx.h
             HINTS ENV ROCM_DIR ENV ROCM_PATH ENV HIP_PATH ENV ROCM_ROOT_DIR /opt/rocm
-        )
-        ecbuild_info( "ROCM path: ${ROCM_PATH}" )
-    endif()
+    )
+endif()
 
-    find_path( ROCTX_INCLUDE_DIRS NAMES roctx.h HINTS ${ROCM_PATH}/include/roctracer/ )
+find_package( rocprofiler-sdk-roctx CONFIG PATHS ${ROCM_PATH}/lib ${ROCM_PATH}/lib/cmake )
+if( NOT rocprofiler-sdk-roctx_FOUND )
+
+    find_path( ROCTX_INCLUDE_DIRS NAMES roctx.h HINTS ${ROCM_PATH}/include/roctracer/ ${ROCM_PATH}/include/rocprofiler-sdk-roctx )
     list( APPEND ROCTX_REQUIRED_VARS ROCTX_INCLUDE_DIRS )
     find_path( ROCTX_LIBRARY_PATH NAMES libroctx64.so HINTS ${ROCM_PATH}/lib/ )
 
@@ -31,8 +30,8 @@ if( NOT rocprofiler-sdk-roctx_FOUND )
 else()
     if( TARGET ${rocprofiler-sdk-roctx_LIBRARIES} )
         set( ROCTX_LIBRARIES ${rocprofiler-sdk-roctx_LIBRARIES} )
-	set( ROCTX_INCLUDE_DIRS ${rocprofiler-sdk-roctx_INCLUDE_DIR} )
-	list( APPEND ROCTX_REQUIRED_VARS ROCTX_INCLUDE_DIRS )
+    set( ROCTX_INCLUDE_DIRS ${rocprofiler-sdk-roctx_INCLUDE_DIR} )
+    list( APPEND ROCTX_REQUIRED_VARS ROCTX_INCLUDE_DIRS )
         set( HAVE_ROCPROFILER_SDK_ROCTX 1 )
     endif()
 endif()

cmake/fiat-import.cmake.in

@@ -15,13 +15,17 @@ set( fiat_VERSION_STR @fiat_VERSION_STR@ )
 set( fiat_HAVE_MPI    @fiat_HAVE_MPI@ )
 set( fiat_HAVE_OMP    @fiat_HAVE_OMP@ )
 set( fiat_HAVE_FCKIT  @fiat_HAVE_FCKIT@ )
+set( fiat_HAVE_DR_HOOK_NVTX   @fiat_HAVE_DR_HOOK_NVTX@ )
+set( fiat_HAVE_DR_HOOK_ROCTX  @fiat_HAVE_DR_HOOK_ROCTX@ )
+set( fiat_HAVE_DR_HOOK_PAPI   @fiat_HAVE_DR_HOOK_PAPI@ )
 set( fiat_HAVE_SINGLE_PRECISION   @fiat_HAVE_SINGLE_PRECISION@ )
 set( fiat_HAVE_DOUBLE_PRECISION   @fiat_HAVE_DOUBLE_PRECISION@ )
 set( fiat_HAVE_MPL_F08 @fiat_HAVE_MPL_F08@ )
 set( fiat_REQUIRES_PRIVATE_DEPENDENCIES @fiat_REQUIRES_PRIVATE_DEPENDENCIES@ )
 
 set( fiat_SOURCE_FILENAMES      @fiat_SOURCE_FILENAMES@ )
 
+
 if( fiat_HAVE_OMP AND NOT TARGET OpenMP::OpenMP_Fortran )
     if( NOT CMAKE_Fortran_COMPILER_LOADED )
         enable_language( Fortran )
@@ -39,6 +43,24 @@ if( fiat_HAVE_MPI AND NOT TARGET MPI::MPI_Fortran )
     endif()
 endif()
 
+if (fiat_REQUIRES_PRIVATE_DEPENDENCIES)
+    set(BACKUP_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+    if( fiat_HAVE_DR_HOOK_NVTX )
+        find_dependency( NVTX )
+    endif()
+
+    if( fiat_HAVE_DR_HOOK_ROCTX )
+        find_dependency( ROCTX )
+    endif()
+
+    if( fiat_HAVE_DR_HOOK_PAPI )
+        find_dependency( PAPI )
+    endif()
+    set(CMAKE_MODULE_PATH ${BACKUP_CMAKE_MODULE_PATH})
+endif()
+
 if( fiat_HAVE_FCKIT AND NOT TARGET fckit )
   find_dependency( fckit HINTS ${CMAKE_CURRENT_LIST_DIR}/../fckit @fckit_DIR@ )
 endif()

src/fiat/drhook/drhook.c

@@ -2659,8 +2659,11 @@ process_options()
       char* opt_name = p;
       /* Assume that everything is OFF by default */
       if (strequ(p,"ALL")) { /* all except profiler data */
-        opt_papi = opt_gethwm = opt_getstk = opt_getrss = opt_getpag = opt_walltime = opt_cputime = opt_cycles = 1;
+        opt_gethwm = opt_getstk = opt_getrss = opt_getpag = opt_walltime = opt_cputime = opt_cycles = 1;
         opt_calls = 1;
+#ifdef DR_HOOK_HAVE_PAPI
+        opt_papi = 1;
+#endif
         any_memstat++;
       }
       else if (strequ(p,"MEM") || strequ(p,"MEMORY")) {
@@ -2732,7 +2735,9 @@ process_options()
         opt_cpuprof = 0; /* Note: Switches cpuprof OFF */
         opt_calls = 1;
         opt_cycles = 1;
+#ifdef DR_HOOK_HAVE_PAPI
         opt_papi = 1;
+#endif
       }
       else if (strequ(p,"CPUPROF")) {
         opt_cpuprof = 1;
@@ -2824,7 +2829,7 @@ process_options()
 
 #if defined(DR_HOOK_HAVE_PAPI)
     if (opt_papi) {
-      newline = 0;
+      int newline = 0;
       env = getenv("DR_HOOK_PAPI_COUNTERS");
       if (env) {
         const char delim[] = ", \t/";

src/fiat/drhook/extensions/papi/drhook_papi.c

@@ -75,14 +75,14 @@ void drhook_papi_print(char* s, long_long* a, int header){
       PAPI_event_code_to_name(papi_counter_event_codes[i], event_name);
       sprintf(&msg[strlen(msg)]," %16s",event_name);
     }
-    printf("%s\n",msg);
+    fprintf(stderr, "%s\n",msg);
   }
 
   sprintf(msg,"%s",s);
   for (int i=0;i<drhook_papi_num_counters();i++){
     sprintf(&msg[strlen(msg)]," %16lld",a[i]);
   }
-  printf("%s\n",msg);
+  fprintf(stderr, "%s\n",msg);
 }
 
 /* a = b - c  (b or c == NULL means use current readings) */      
@@ -133,16 +133,16 @@ long_long drhook_papi_read(int counterId){
 
 int drhook_papi_readAll(long_long * counterArray){
   if (drhook_papi_state!=drhook_papi_running){
-    printf("DRHOOK:PAPI: Error reading counters, papi is not running\n");
+    fprintf(stderr, "DRHOOK:PAPI: Error reading counters, papi is not running\n");
     exit (1);
   }
   if (!drhook_papi_event_set){
-    printf("DRHOOK:PAPI: Error reading counters, eventset\n");
+    fprintf(stderr, "DRHOOK:PAPI: Error reading counters, eventset\n");
     exit (1);
   }
   int err=PAPI_read(drhook_papi_event_set[papi_safe_thread_num()],counterArray);
   if (err!=PAPI_OK){
-    printf("DRHOOK:PAPI:PAPI_read: Error reading counters, thread=%ld es=%d %s\n",papi_safe_thread_num(),drhook_papi_event_set[papi_safe_thread_num()],PAPI_strerror(err));
+    fprintf(stderr, "DRHOOK:PAPI:PAPI_read: Error reading counters, thread=%ld es=%d %s\n",papi_safe_thread_num(),drhook_papi_event_set[papi_safe_thread_num()],PAPI_strerror(err));
   }
 #if defined(DEBUG)
   drhook_papi_print("readAll:",counterArray,0);
@@ -173,7 +173,7 @@ int drhook_papi_init(int rank){
   drhook_papi_rank=rank;
 
   if (oml_in_parallel()) {
-    printf("DRHOOK:PAPI: Error, tried to initialise from a parallel region :-(\n");
+    fprintf(stderr, "DRHOOK:PAPI: Error, tried to initialise from a parallel region :-(\n");
     return 0;
   }
 
@@ -183,35 +183,35 @@ int drhook_papi_init(int rank){
   paperr=PAPI_library_init(PAPI_VER_CURRENT);
   if (paperr != PAPI_VER_CURRENT) {
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI:PAPI_library_init: ret code=%d version loaded =%d ", paperr,PAPI_VER_CURRENT);
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
     if (paperr > 0) {
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, library version mismatch between compilation and run!\n");
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       return 0;
     }
     if (paperr == PAPI_EINVAL){
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, PAPI_EINVAL\n");
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       return 0;
     }
     if (paperr == PAPI_ENOMEM){
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, PAPI_ENOMEM\n");
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       return 0;
     }
     if (paperr == PAPI_ESBSTR){
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, PAPI_ESBSTR\n");
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       return 0;
     }
     if (paperr == PAPI_ESYS){
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, PAPI_ESYS\n");
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       return 0;
     }
     else {
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, unknown error code: %d\n", paperr);
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       return 0;
     }
   }
@@ -224,7 +224,7 @@ int drhook_papi_init(int rank){
 
   if( paperr != PAPI_OK ) {
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, thread init failed (%s)",PAPI_strerror(paperr));
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
     return 0;
   }
 
@@ -235,7 +235,7 @@ int drhook_papi_init(int rank){
            nthreads);
 
   if (drhook_papi_rank==0 && !silent) {
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
   }
 
   drhook_papi_event_set=malloc_drhook(nthreads*sizeof(int));
@@ -252,7 +252,7 @@ int drhook_papi_init(int rank){
 
   drhook_papi_state=drhook_papi_running;
   if (drhook_papi_rank==0 && !silent) {
-    printf("DRHOOK:PAPI: Initialisation sucess\n");
+    fprintf(stderr, "DRHOOK:PAPI: Initialisation sucess\n");
   }
   return 1;
 }
@@ -266,27 +266,27 @@ int drhook_papi_start_threads(int* events){
   papiErr=PAPI_create_eventset(&events[thread]);
   if (papiErr != PAPI_OK){
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, create event set failed (%s) \n",PAPI_strerror(papiErr));
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
     return 0;
   }
 
-  if (!silent) printf("DRHOOK:PAPI: Event set %d created for thread %d\n",events[thread],thread);
+  if (!silent) fprintf(stderr, "DRHOOK:PAPI: Event set %d created for thread %d\n",events[thread],thread);
 
   if (!silent && drhook_papi_rank==0 && thread==0)
-    printf("DRHOOK:PAPI: Attempting to add events to event set:\n");
+    fprintf(stderr, "DRHOOK:PAPI: Attempting to add events to event set:\n");
 
   for (int counter=0; counter < drhook_papi_num_counters(); counter ++) {
     int eventCode;
 
     if (!silent && drhook_papi_rank==0 && thread==0) {
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: %s", papi_counter_names[counter]);
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
     }
 
     papiErr=PAPI_event_name_to_code(papi_counter_names[counter], &eventCode);
     if (papiErr != PAPI_OK){
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, event name to code failed for %s (%s)", papi_counter_names[counter], PAPI_strerror(papiErr));
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       PAPI_perror("initPapi");
       return 0;
     }
@@ -295,33 +295,33 @@ int drhook_papi_start_threads(int* events){
     papiErr=PAPI_add_event(events[thread],eventCode);
     if (papiErr!=PAPI_OK){
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, add_event failed: %d (%s)",papiErr,PAPI_strerror(papiErr));
-      printf("%s\n",pmsg);
+      fprintf(stderr, "%s\n",pmsg);
       if (papiErr == PAPI_EINVAL) {
-        printf("Invalid argument. ");
+        fprintf(stderr, "Invalid argument. ");
       }
       else if (papiErr == PAPI_ENOMEM) {
-        printf("Out of memory. ");
+        fprintf(stderr, "Out of memory. ");
       }
       else if (papiErr == PAPI_ENOEVST) {
-        printf("EventSet does not exist. ");
+        fprintf(stderr, "EventSet does not exist. ");
       }
       else if (papiErr == PAPI_EISRUN) {
-        printf("EventSet is running. ");
+        fprintf(stderr, "EventSet is running. ");
       }
       else if (papiErr == PAPI_ECNFLCT) {
-        printf("Conflict. ");
+        fprintf(stderr, "Conflict. ");
       }
       else if (papiErr == PAPI_ENOEVNT) {
-        printf("Preset not available. ");
+        fprintf(stderr, "Preset not available. ");
       }
-      printf("This is an error within PAPI and not DrHook. DrHook is only reporting the error it received.\n");
+      fprintf(stderr, "This is an error within PAPI and not DrHook. DrHook is only reporting the error it received.\n");
       return 0;
     }
     else {
 #if defined(DEBUG)
       snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Added code=%d to Event set %d",eventCode, events[thread]);
       if (thread==0) {
-        printf("%s\n",pmsg);
+        fprintf(stderr, "%s\n",pmsg);
       }
 #endif
     }
@@ -332,31 +332,31 @@ int drhook_papi_start_threads(int* events){
   papiErr = PAPI_list_events(events[thread], checkEvents, &number);
   if (papiErr != PAPI_OK){
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error querying events - %d=%s",papiErr,PAPI_strerror(papiErr));
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
     return 0;
   }
 #if defined(DEBUG)
   for (int counter=0;counter<number;counter++) {
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Ev: %d=%d",counter,events[counter]);
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
   }
 #endif
 
   if (number != drhook_papi_num_counters()) {
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error checking events - expected=%d got=%d",drhook_papi_num_counters(),number);
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
   }
 
   papiErr=PAPI_start(events[thread]);
 
   if (papiErr != PAPI_OK) {
     snprintf(pmsg,STD_MSG_LEN,"DRHOOK:PAPI: Error, starting counters failed (%d=%s)",papiErr,PAPI_strerror(papiErr));
-    printf("%s\n",pmsg);
+    fprintf(stderr, "%s\n",pmsg);
     return 0;
   }
 
 #if defined(DEBUG)
-  printf("DRHOOK:PAPI: Started counting for thread %d \n",thread);
+  fprintf(stderr, "DRHOOK:PAPI: Started counting for thread %d \n",thread);
 #endif
 
   return 1;