Merge pull request #29 from JPenuchot/example-with-vcpkg

Dropping TBB for its linkage being too problematic for very little functional gains

example/.gitignore

@@ -0,0 +1 @@
+vcpkg/

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)

grapher/lib/grapher/plotters/compare_by.cpp

@@ -1,7 +1,4 @@
-#include "grapher/predicates.hpp"
 #include <algorithm>
-#include <bits/ranges_algo.h>
-#include <execution>
 #include <filesystem>
 #include <fstream>
 #include <string>
@@ -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>
@@ -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,

grapher/lib/grapher/predicates.cpp

@@ -1,4 +1,3 @@
-#include <bits/iterator_concepts.h>
 #include <regex>
 #include <string>
 

grapher/lib/grapher/utils/json.cpp

@@ -1,5 +1,4 @@
 #include <algorithm>
-#include <execution>
 #include <fstream>
 
 #include <nlohmann/json.hpp>
@@ -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;
 }