From 369933761ae450342b1771b561da3796c18c0f6e Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 10 Oct 2013 16:59:41 -0400 Subject: Carpet: Make dependency on CycleClock optional --- Carpet/CarpetLib/configuration.ccl | 4 ++-- Carpet/CarpetLib/interface.ccl | 2 -- Carpet/CarpetLib/src/timestat.hh | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Carpet/CarpetLib/configuration.ccl b/Carpet/CarpetLib/configuration.ccl index b1192f5bf..634e3175d 100644 --- a/Carpet/CarpetLib/configuration.ccl +++ b/Carpet/CarpetLib/configuration.ccl @@ -7,9 +7,9 @@ PROVIDES CarpetLib } # TODO: make Vectors optional -REQUIRES CycleClock MPI Vectors +REQUIRES MPI Vectors -OPTIONAL Boost hwloc LoopControl +OPTIONAL Boost CycleClock hwloc LoopControl { } diff --git a/Carpet/CarpetLib/interface.ccl b/Carpet/CarpetLib/interface.ccl index d1054b0e4..14fa531d6 100644 --- a/Carpet/CarpetLib/interface.ccl +++ b/Carpet/CarpetLib/interface.ccl @@ -2,8 +2,6 @@ IMPLEMENTS: CarpetLib -INHERITS: CycleClock - includes header: mpi_string.hh in mpi_string.hh includes header: cacheinfo.hh in cacheinfo.hh diff --git a/Carpet/CarpetLib/src/timestat.hh b/Carpet/CarpetLib/src/timestat.hh index a773c4d2e..5e008f727 100644 --- a/Carpet/CarpetLib/src/timestat.hh +++ b/Carpet/CarpetLib/src/timestat.hh @@ -8,6 +8,12 @@ #include #include +#ifndef HAVE_TICK_COUNTER +typedef int ticks; +inline ticks getticks() { return 0; } +inline double seconds_per_tick(void) { return 0.0; } +inline void measure_tick(void) {} +#endif -- cgit v1.2.3