diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-10-10 16:59:41 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-10-10 16:59:41 -0400 |
| commit | 369933761ae450342b1771b561da3796c18c0f6e (patch) | |
| tree | d676ae7520c076e3a41aef1bcf9cb7035284f5ce | |
| parent | b991b3a287c25a543b5c6bb81273e88d50893e55 (diff) | |
Carpet: Make dependency on CycleClock optional
| -rw-r--r-- | Carpet/CarpetLib/configuration.ccl | 4 | ||||
| -rw-r--r-- | Carpet/CarpetLib/interface.ccl | 2 | ||||
| -rw-r--r-- | 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 <cctk.h> #include <cycleclock.h> +#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 |