Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dropping TBB #29

Merged
merged 6 commits into from
May 30, 2023
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
1 change: 1 addition & 0 deletions example/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vcpkg/
6 changes: 3 additions & 3 deletions grapher/cmake/grapher-target.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
7 changes: 2 additions & 5 deletions grapher/lib/grapher/plotters/compare_by.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#include "grapher/predicates.hpp"
#include <algorithm>
#include <bits/ranges_algo.h>
#include <execution>
#include <filesystem>
#include <fstream>
#include <string>
Expand All @@ -17,6 +14,7 @@

#include <grapher/core.hpp>
#include <grapher/plotters/compare_by.hpp>
#include <grapher/predicates.hpp>
#include <grapher/utils/error.hpp>
#include <grapher/utils/json.hpp>
#include <grapher/utils/math.hpp>
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion grapher/lib/grapher/predicates.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include <bits/iterator_concepts.h>
#include <regex>
#include <string>

Expand Down
5 changes: 2 additions & 3 deletions grapher/lib/grapher/utils/json.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include <algorithm>
#include <execution>
#include <fstream>

#include <nlohmann/json.hpp>
Expand Down Expand Up @@ -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;
}
Expand Down