Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/configs/flops.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@
"select" :
[
"scale(flops,1e-6) as Mflops",
"ratio(flops,sum#time.duration,1e-6) as Mflops/s"
"ratio(flops,sum#time.duration.ns,1e3) as Mflops/s"
]
},
{ "level" : "cross",
"select" :
[
"sum(scale#flops) as Mflops",
"avg(ratio#flops/sum#time.duration) as \"Mflops/s (avg)\"",
"max(ratio#flops/sum#time.duration) as \"Mflops/s (max)\"",
"sum(ratio#flops/sum#time.duration) as \"Mflops/s (sum)\""
"avg(ratio#flops/sum#time.duration.ns) as \"Mflops/s (avg)\"",
"max(ratio#flops/sum#time.duration.ns) as \"Mflops/s (max)\"",
"sum(ratio#flops/sum#time.duration.ns) as \"Mflops/s (sum)\""
]
}
]
Expand Down
18 changes: 4 additions & 14 deletions src/caliper/ConfigManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ extern const char* builtin_rocm_option_specs;
extern const char* builtin_pcp_option_specs;
extern const char* builtin_umpire_option_specs;
extern const char* builtin_kokkos_option_specs;

extern const char* builtin_papi_hsw_option_specs;
extern const char* builtin_papi_spr_option_specs;
extern const char* builtin_papi_topdown_option_specs;

extern void add_submodule_controllers_and_services();

Expand Down Expand Up @@ -1381,21 +1379,13 @@ struct ConfigManager::ConfigManagerImpl {
#endif
#ifdef CALIPER_HAVE_KOKKOS
builtin_kokkos_option_specs,
#endif
#ifdef CALIPER_HAVE_PAPI
builtin_papi_topdown_option_specs,
#endif
builtin_base_option_specs
})
{
#ifdef CALIPER_HAVE_PAPI
#ifdef CALIPER_HAVE_ARCH
if (std::string(CALIPER_HAVE_ARCH) == "sapphirerapids") {
builtin_option_specs_list.push_back(builtin_papi_spr_option_specs);
} else {
builtin_option_specs_list.push_back(builtin_papi_hsw_option_specs);
}
#else
builtin_option_specs_list.push_back(builtin_papi_hsw_option_specs);
#endif
#endif
for (const char* spec_p : builtin_option_specs_list)
add_global_option_specs(spec_p);
}
Expand Down
Loading