diff --git a/cpp/config.hpp b/cpp/config.hpp index dffc748..e7f3db5 100644 --- a/cpp/config.hpp +++ b/cpp/config.hpp @@ -6,14 +6,12 @@ #ifdef __CUDACC__ #define NB_THREADS 1024 - #define NB_THREADS_2D_X 32 #define NB_THREADS_2D_Y 32 -__device__ constexpr const size_t M = 5; //log2(NB_THREADS_2D_Y)); - #define NB_THREADS_3D_X 16 #define NB_THREADS_3D_Y 16 #define NB_THREADS_3D_Z 4 +__device__ constexpr const size_t M = 5; //log2(NB_THREADS_2D_Y)); #endif // Save state to avoid recalulation on restart @@ -25,9 +23,9 @@ __device__ constexpr const size_t M = 5; //log2(NB_THREADS_2D_Y)); // Number of weak classifiers // const size_t TS[] = { 1 }; // const size_t TS[] = { 1, 5, 10 }; -// const size_t TS[] = { 1, 5, 10, 25, 50 }; +const size_t TS[] = { 1, 5, 10, 25, 50 }; // const size_t TS[] = { 1, 5, 10, 25, 50, 100, 200, 300 }; -const size_t TS[] = { 1, 5, 10, 25, 50, 100, 200, 300, 400, 500, 1000 }; +// const size_t TS[] = { 1, 5, 10, 25, 50, 100, 200, 300, 400, 500, 1000 }; // Enable verbose output (for debugging purposes) #define __DEBUG false diff --git a/python/config.py b/python/config.py index 0f74607..5a6bbdb 100644 --- a/python/config.py +++ b/python/config.py @@ -14,16 +14,17 @@ SAVE_STATE = True # Redo the state even if it's already saved FORCE_REDO = False # Use NJIT to greatly accelerate runtime -COMPILE_WITH_C = False +COMPILE_WITH_C = True # Use GPU to greatly accelerate runtime (as priority over NJIT) GPU_BOOSTED = True # Number of weak classifiers # TS = [1] # TS = [1, 5, 10] -# TS = [1, 5, 10, 25, 50] +TS = [1, 5, 10, 25, 50] # TS = [1, 5, 10, 25, 50, 100, 200] # TS = [1, 5, 10, 25, 50, 100, 200, 300] -TS = [1, 5, 10, 25, 50, 100, 200, 300, 400, 500, 1000] +# TS = [1, 5, 10, 25, 50, 100, 200, 300, 400, 500, 1000] + # Enable verbose output (for debugging purposes) __DEBUG = False # Debugging options