From eeff720ae4e58688f2e23d9127003ecab21c8a79 Mon Sep 17 00:00:00 2001 From: augustin64 Date: Tue, 28 Mar 2023 12:54:49 +0200 Subject: [PATCH] Add CUDA blocksize to config.h --- src/cnn/convolution.c | 4 +--- src/cnn/convolution.cu | 5 +---- src/cnn/function.c | 4 +--- src/cnn/function.cu | 4 +--- src/cnn/include/config.h | 5 +++++ src/cnn/make.c | 4 +--- src/cnn/make.cu | 4 +--- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/cnn/convolution.c b/src/cnn/convolution.c index 1f17c30..2e89074 100644 --- a/src/cnn/convolution.c +++ b/src/cnn/convolution.c @@ -6,9 +6,7 @@ #include "../include/utils.h" -#define BLOCKSIZE_x 16 -#define BLOCKSIZE_y 8 -#define BLOCKSIZE_z 8 +#include "include/config.h" void make_convolution_cpu(Kernel_cnn* kernel, float*** input, float*** output, int output_dim) { diff --git a/src/cnn/convolution.cu b/src/cnn/convolution.cu index 22994fc..847ad15 100644 --- a/src/cnn/convolution.cu +++ b/src/cnn/convolution.cu @@ -5,10 +5,7 @@ #include "include/struct.h" #include "../include/utils.h" - -#define BLOCKSIZE_x 16 -#define BLOCKSIZE_y 8 -#define BLOCKSIZE_z 8 +#include "include/config.h" void make_convolution_cpu(Kernel_cnn* kernel, float*** input, float*** output, int output_dim) { diff --git a/src/cnn/function.c b/src/cnn/function.c index e362e42..4ac6ecb 100644 --- a/src/cnn/function.c +++ b/src/cnn/function.c @@ -7,9 +7,7 @@ #include "include/function.h" -#define BLOCKSIZE_x 16 -#define BLOCKSIZE_y 8 -#define BLOCKSIZE_z 8 +#include "include/config.h" //* Identity #ifdef __CUDACC__ diff --git a/src/cnn/function.cu b/src/cnn/function.cu index e362e42..4ac6ecb 100644 --- a/src/cnn/function.cu +++ b/src/cnn/function.cu @@ -7,9 +7,7 @@ #include "include/function.h" -#define BLOCKSIZE_x 16 -#define BLOCKSIZE_y 8 -#define BLOCKSIZE_z 8 +#include "include/config.h" //* Identity #ifdef __CUDACC__ diff --git a/src/cnn/include/config.h b/src/cnn/include/config.h index 6c4535e..c5dbc99 100644 --- a/src/cnn/include/config.h +++ b/src/cnn/include/config.h @@ -38,4 +38,9 @@ // https://arxiv.org/pdf/1905.11881.pdf #define NETWORK_CLIP_VALUE 300 +//* Paramètres CUDA +#define BLOCKSIZE_x 10 +#define BLOCKSIZE_y 10 +#define BLOCKSIZE_z 10 + #endif \ No newline at end of file diff --git a/src/cnn/make.c b/src/cnn/make.c index 665655b..f025b15 100644 --- a/src/cnn/make.c +++ b/src/cnn/make.c @@ -8,9 +8,7 @@ #include "include/make.h" -#define BLOCKSIZE_x 16 -#define BLOCKSIZE_y 8 -#define BLOCKSIZE_z 8 +#include "include/config.h" /* diff --git a/src/cnn/make.cu b/src/cnn/make.cu index 665655b..f025b15 100644 --- a/src/cnn/make.cu +++ b/src/cnn/make.cu @@ -8,9 +8,7 @@ #include "include/make.h" -#define BLOCKSIZE_x 16 -#define BLOCKSIZE_y 8 -#define BLOCKSIZE_z 8 +#include "include/config.h" /*