diff --git a/example/.gitignore b/example/.gitignore new file mode 100644 index 0000000..78eb9f3 --- /dev/null +++ b/example/.gitignore @@ -0,0 +1 @@ +vcpkg/ diff --git a/grapher/cmake/grapher-target.cmake b/grapher/cmake/grapher-target.cmake index dbbe55c..bb0c0d3 100644 --- a/grapher/cmake/grapher-target.cmake +++ b/grapher/cmake/grapher-target.cmake @@ -12,12 +12,12 @@ llvm_map_components_to_libnames(llvm_libs support) target_link_libraries(grapher PUBLIC + ${llvm_libs} ctbench-compile-opts + fmt::fmt nlohmann_json::nlohmann_json sciplot::sciplot - fmt::fmt stdc++fs - tbb - ${llvm_libs}) +) target_compile_options(grapher PUBLIC -DJSON_NOEXCEPTION) diff --git a/grapher/lib/grapher/plotters/compare_by.cpp b/grapher/lib/grapher/plotters/compare_by.cpp index 9038e2a..6b6b8e1 100644 --- a/grapher/lib/grapher/plotters/compare_by.cpp +++ b/grapher/lib/grapher/plotters/compare_by.cpp @@ -1,7 +1,4 @@ -#include "grapher/predicates.hpp" #include -#include -#include #include #include #include @@ -17,6 +14,7 @@ #include #include +#include #include #include #include @@ -307,8 +305,7 @@ void plotter_compare_by_t::plot(benchmark_set_t const &bset, fs::create_directories(dest); // Drawing, ie. unwrapping the nested maps and drawing curves + saving plots - std::for_each(std::execution::par_unseq, curve_aggregate_map.begin(), - curve_aggregate_map.end(), + std::for_each(curve_aggregate_map.begin(), curve_aggregate_map.end(), [&](auto const &aggregate_key_value) { generate_plot(aggregate_key_value, {.plot_output_folder = dest, diff --git a/grapher/lib/grapher/predicates.cpp b/grapher/lib/grapher/predicates.cpp index 77dbdcf..a10e32c 100644 --- a/grapher/lib/grapher/predicates.cpp +++ b/grapher/lib/grapher/predicates.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/grapher/lib/grapher/utils/json.cpp b/grapher/lib/grapher/utils/json.cpp index 683adf5..18da8a3 100644 --- a/grapher/lib/grapher/utils/json.cpp +++ b/grapher/lib/grapher/utils/json.cpp @@ -1,5 +1,4 @@ #include -#include #include #include @@ -132,8 +131,8 @@ filtered_values_sums(benchmark_instance_t const &instance, return val; }; - std::transform(std::execution::par_unseq, instance.repetitions.begin(), - instance.repetitions.end(), res.begin(), get_val); + std::transform(instance.repetitions.begin(), instance.repetitions.end(), + res.begin(), get_val); return res; }