Benchmark R3 KOKESortV2 Support, New Visualizer, extern C for parts, Visualizer new fit functions with R^2 calculation

Author: KFKMan

.gitignore

@@ -71,4 +71,6 @@ mutated/
 **/state.json
 **/voters.json
 
-**/futOutput*
+**/futOutput*
+
+**/benchmark_results*

src/CMakeLists.txt

@@ -193,11 +193,12 @@ include(CPack)
 
 set_target_properties(KOKESort PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-if(WIN32 AND NOT PYBINDWRAPPER)
-    target_compile_definitions(KOKESort PRIVATE KOKESORT_EXPORTS)
+if(PYBINDWRAPPER)
+message("KOKESORT_STATIC Defined")
+target_compile_definitions(KOKESort PRIVATE KOKESORT_STATIC)
 else()
-    message(INFO "KOKESORT_STATIC Defined")
-    target_compile_definitions(KOKESort PRIVATE KOKESORT_STATIC)
+message("KOKESORT_EXPORTS Defined")
+target_compile_definitions(KOKESort PRIVATE KOKESORT_EXPORTS)
 endif()
 
 #target_compile_definitions(KOKESort PRIVATE KOKESORT_IMPORTS)

src/Global.h

@@ -75,12 +75,12 @@ extern "C" {  /* C++ name mangling */
 #ifdef WINDOWS
     #if defined(KOKESORT_STATIC)
         #define KOKESORT_API
-    #elif defined(KOKESORT_IMPORTS)
-        #define KOKESORT_API __declspec(dllimport)
+    //#elif defined(KOKESORT_IMPORTS)
+    //    #define KOKESORT_API __declspec(dllimport)
     #elif defined(KOKESORT_EXPORTS)
         #define KOKESORT_API __declspec(dllexport)
     #else
-        #define KOKESORT_API
+        #define KOKESORT_API __declspec(dllimport)
     #endif
 #else
     #define KOKESORT_API

src/benchmarkr3/config.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+typedef int GenerateValueType;
+
+const int MaxValue = 10000000;
+
+//For KOKESortV2
+const int SpaceCount = 100;

src/benchmarkr3/cwrappersys.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include <functional>
-
-using CompareFunction = int(*)(const void*, const void*);
-using CSortFunction = void(*)(void* arr, size_t size, size_t elemSize, CompareFunction cmp);
+#include <sort.h>
+#include <KOKESortV2.h>
+#include <config.hpp>
 
 template<typename T>
 int default_compare(const void* a, const void* b) {
@@ -20,7 +20,7 @@ int default_compare(const void* a, const void* b) {
 }
 
 template<typename T>
-std::function<void(std::vector<T>&)> wrap_c_sort(CSortFunction sorter) {
+std::function<void(std::vector<T>&)> wrap_c_sort(SortFunction sorter) {
     return [sorter](std::vector<T>& vec) 
     {
         if (vec.empty())
@@ -29,4 +29,24 @@ std::function<void(std::vector<T>&)> wrap_c_sort(CSortFunction sorter) {
         }
         sorter(static_cast<void*>(vec.data()), vec.size(), sizeof(T), default_compare<T>);
     };
+}
+
+GenerateValueType Divider = MaxValue / SpaceCount;
+
+size_t indexer(const void *valptr)
+{
+    const GenerateValueType val1 = *(const GenerateValueType *)valptr;
+    return val1 / Divider;
+}
+
+template<typename T>
+std::function<void(std::vector<T>&)> wrap_c_sort_for_KOKESortV2(SortFunction sorter) {
+    return [sorter](std::vector<T>& vec) 
+    {
+        if (vec.empty())
+        {
+            return;
+        }
+        SortV2(static_cast<void*>(vec.data()), vec.size(), sizeof(T), SpaceCount, indexer, default_compare<T>, sorter);
+    };
 }

src/benchmarkr3/main.cpp

@@ -1,4 +1,3 @@
-#include "sortsys.hpp"
 #include <iostream>
 #include <fstream>
 #include <chrono>
@@ -7,6 +6,7 @@
 
 #include <sortsys.hpp>
 #include <cwrappersys.hpp>
+#include <config.hpp>
 
 using json = nlohmann::json;
 
@@ -53,21 +53,6 @@ void initialize_csv(const std::string &filename)
         std::cerr << "Error: Could not create file!" << std::endl;
     }
 }
-
-typedef int GenerateValueType;
-
-const int MaxValue = 10000000;
-
-const int SpaceCount = 100;
-
-GenerateValueType Divider = MaxValue / SpaceCount;
-
-size_t indexer(const void *valptr)
-{
-    const GenerateValueType val1 = *(const GenerateValueType *)valptr;
-    return val1 / Divider;
-}
-
 template <typename T>
 std::vector<T> random_vector(size_t size, T min, T max)
 {

src/benchmarkr3/sortsys.hpp

@@ -15,6 +15,7 @@ using SorterFunction = std::function<void(std::vector<int>&)>;
 #define SORT_FN(name, func) { name, [](SORT_VEC) { func(v); } }
 #define SORT_CPP(name, sorter) SORT_FN(name, cppsort::sorter{})
 #define SORT_C(name, cfunc) SORT_FN(name, wrap_c_sort<int>(cfunc))
+#define SORT_C_KOKESortV2(name, cfunc) SORT_FN(name, wrap_c_sort_for_KOKESortV2<int>(cfunc))
 
 inline std::unordered_map<std::string, SorterFunction> get_sorters() {
     return 
@@ -27,6 +28,7 @@ inline std::unordered_map<std::string, SorterFunction> get_sorters() {
         SORT_C("c_quick", quickSort),
         SORT_C("c_selection", selectionSort),
         SORT_C("c_kokev1", SortV1Self),
+        SORT_C_KOKESortV2("c_kokev2_quick", quickSort),
         SORT_CPP("counting",     counting_sorter),
         SORT_CPP("drop_merge",   drop_merge_sorter),
         SORT_CPP("heap",         heap_sorter),

src/benchmarkr3/test.json

@@ -8,6 +8,7 @@
       "c_quick",
       "c_selection",
       "c_kokev1",
+      "c_kokev2_quick",
       "counting",
       "drop_merge",
       "heap",

src/parts/bubblesort.h

@@ -3,6 +3,14 @@
 
 #include <sort.h>
 
+#ifdef __cplusplus
+extern "C" {  /* C++ name mangling */
+#endif
+
 KOKESORT_API void bubbleSort(void *arr, size_t n, size_t elementSize, CompareFunction cmp);
 
+#ifdef __cplusplus
+ };
+#endif
+
 #endif

src/parts/heapsort.h

@@ -3,6 +3,14 @@
 
 #include <sort.h>
 
+#ifdef __cplusplus
+extern "C" {  /* C++ name mangling */
+#endif
+
 KOKESORT_API void heapSort(void *arr, size_t n, size_t elementSize, CompareFunction cmp);
 
+#ifdef __cplusplus
+ };
+#endif
+
 #endif