Merge pull request #25 from CNugteren/claduc_and_json

Claduc C++11 interface & method to output JSON
CNugteren · Aug 3, 2015 · 15782dd · 15782dd
2 parents 039d9ea + 43a0e9a
commit 15782dd
Show file tree

Hide file tree

Showing 10 changed files with 488 additions and 355 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,8 @@
 
+Version 1.7.0
+- Now using the Claduc C++11 interface to OpenCL
+- Added a method to print all tuning results in JSON-format to file
+
 Version 1.6.4
 - Reduced the requirements from GCC 4.8.0 to 4.7.0
 - Fixes various warnings on Clang

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,8 +26,8 @@
 cmake_minimum_required(VERSION 2.8.10)
 project("cltune" CXX)
 set(cltune_VERSION_MAJOR 1)
-set(cltune_VERSION_MINOR 6)
-set(cltune_VERSION_PATCH 4)
+set(cltune_VERSION_MINOR 7)
+set(cltune_VERSION_PATCH 0)
 
 # Options
 option(SAMPLES "Enable compilation of sample programs" ON)

diff --git a/include/cltune.h b/include/cltune.h
@@ -33,6 +33,7 @@
 #include <vector> // std::vector
 #include <memory> // std::unique_ptr
 #include <functional> // std::function
+#include <utility> // std::pair
 
 namespace cltune {
 // =================================================================================================
@@ -126,6 +127,8 @@ class Tuner {
   // Returns the execution time in miliseconds.
   double PrintToScreen() const;
   void PrintFormatted() const;
+  void PrintJSON(const std::string &filename,
+                 const std::vector<std::pair<std::string,std::string>> &descriptions) const;
   void PrintToFile(const std::string &filename) const;
 
   // Disables all further printing to stdout