prefix phasta macros with PUMI_and update ph cmake

- phasta/CMakeLists.txt: add PUMI_ prefix to cmake variables and macros.
- remove add_definitions and change INTERFACE to PUBLIC.
- the effect of doing add_definitions and then adding INTERFACE
  definitions is the same as adding PRIVATE and then INTERFACE. adding
  both PRIVATE and INTERFACE is the same as PUBLIC.

- phasta/phiotimer.h, phasta/phiotimer.cc: use PUMI_ prefixed macros.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>

Author: bobpaw

phasta/CMakeLists.txt

@@ -72,25 +72,21 @@ add_library(ph ${SOURCES})
 
 #determine which timer to use based on the target system and compiler
 if(CMAKE_SYSTEM_NAME MATCHES BlueGeneQ*)
-  add_definitions(-DUSE_PCU_TIME)
-  target_compile_definitions(ph INTERFACE -DUSE_PCU_TIME)
+  target_compile_definitions(ph PUBLIC -DPUMI_USE_PCU_TIME)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES Intel)
-  add_definitions(-DHAVE_INTEL_RDTSC)
-  target_compile_definitions(ph INTERFACE -DHAVE_INTEL_RDTSC)
+  target_compile_definitions(ph PUBLIC -DPUMI_HAVE_INTEL_RDTSC)
 else()
   #from https://github.com/abduld/libwb/issues/5
   include(CheckFunctionExists)
-  CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
-  if(NOT HAVE_CLOCK_GETTIME)
+  CHECK_FUNCTION_EXISTS(clock_gettime PUMI_HAVE_CLOCK_GETTIME)
+  if(NOT PUMI_HAVE_CLOCK_GETTIME)
     find_library(LIBRT_LIBRARIES rt)
     message(STATUS "librt: ${LIBRT_LIBRARIES}")
-  endif(NOT HAVE_CLOCK_GETTIME)
-  if( HAVE_CLOCK_GETTIME OR LIBRT_LIBRARIES )
-    add_definitions(-DHAVE_CLOCK_GETTIME)
-    target_compile_definitions(ph INTERFACE -DHAVE_CLOCK_GETTIME)
+  endif(NOT PUMI_HAVE_CLOCK_GETTIME)
+  if( PUMI_HAVE_CLOCK_GETTIME OR LIBRT_LIBRARIES )
+    target_compile_definitions(ph PUBLIC -DPUMI_HAVE_CLOCK_GETTIME)
   else()
-    add_definitions(-DUSE_PCU_TIME)
-    target_compile_definitions(ph INTERFACE -DUSE_PCU_TIME)
+    target_compile_definitions(ph PUBLIC -DPUMI_USE_PCU_TIME)
   endif()
 endif()
 

phasta/phiotimer.cc

@@ -27,7 +27,7 @@ struct phastaio_stats {
 };
 static struct phastaio_stats phastaio_global_stats;
 
-#if defined(HAVE_INTEL_RDTSC)
+#if defined(PUMI_HAVE_INTEL_RDTSC)
 /* return the cycle count */
 void phastaio_time(phastaioTime* t) {
   *t = _rdtsc(); //intel intrinsic
@@ -60,7 +60,7 @@ size_t phastaio_time_diff(phastaioTime* start, phastaioTime* end) {
   size_t us = ((double)cycles)/phastaio_global_stats.cpus;
   return us;
 }
-#elif defined(USE_PCU_TIME)
+#elif defined(PUMI_USE_PCU_TIME)
 void phastaio_time(phastaioTime* t) {
   *t = pcu::Time();
 }
@@ -69,7 +69,7 @@ size_t phastaio_time_diff(phastaioTime* start, phastaioTime* end) {
   size_t elapsed = static_cast<size_t>((*end-*start)*MILLION);
   return elapsed;
 }
-#elif defined(HAVE_CLOCK_GETTIME)
+#elif defined(PUMI_HAVE_CLOCK_GETTIME)
 void phastaio_time(phastaioTime* t) {
   int err;
   err = clock_gettime(CLOCK_MONOTONIC,t);

phasta/phiotimer.h

@@ -59,11 +59,11 @@ enum phastaio_file {
   NUM_PHASTAIO_MODES
 };
 
-#if defined(HAVE_INTEL_RDTSC)
+#if defined(PUMI_HAVE_INTEL_RDTSC)
 typedef size_t phastaioTime;
-#elif defined(USE_PCU_TIME)
+#elif defined(PUMI_USE_PCU_TIME)
 typedef double phastaioTime;
-#elif defined(HAVE_CLOCK_GETTIME)
+#elif defined(PUMI_HAVE_CLOCK_GETTIME)
 #include <time.h>
 typedef struct timespec phastaioTime;
 #endif