From 38cb0c9ac0562657b84b77a5a55fb4f39a1c2edc Mon Sep 17 00:00:00 2001 From: LordMathis Date: Sun, 23 Nov 2025 20:57:08 +0100 Subject: [PATCH] Restructure include paths --- include/backend/{ => cpu}/cpu.hpp | 0 include/backend/{ => cuda}/cuda.cuh | 0 .../cuda}/kernels/activation_functions.cuh | 0 include/{ => backend/cuda}/kernels/convolution.cuh | 0 include/{ => backend/cuda}/kernels/matmul.cuh | 0 include/{ => backend/cuda}/kernels/pool.cuh | 0 src/backends/cuda/cuda_backend.cu | 2 +- src/backends/cuda/kernels/activation_functions.cu | 2 +- src/backends/cuda/kernels/convolution.cu | 6 +++--- src/backends/cuda/kernels/matmul.cu | 4 ++-- src/backends/cuda/kernels/pool.cu | 2 +- src/backends/cuda/layer_ops.cu | 10 +++++----- src/backends/cuda/tensor_ops.cu | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) rename include/backend/{ => cpu}/cpu.hpp (100%) rename include/backend/{ => cuda}/cuda.cuh (100%) rename include/{ => backend/cuda}/kernels/activation_functions.cuh (100%) rename include/{ => backend/cuda}/kernels/convolution.cuh (100%) rename include/{ => backend/cuda}/kernels/matmul.cuh (100%) rename include/{ => backend/cuda}/kernels/pool.cuh (100%) diff --git a/include/backend/cpu.hpp b/include/backend/cpu/cpu.hpp similarity index 100% rename from include/backend/cpu.hpp rename to include/backend/cpu/cpu.hpp diff --git a/include/backend/cuda.cuh b/include/backend/cuda/cuda.cuh similarity index 100% rename from include/backend/cuda.cuh rename to include/backend/cuda/cuda.cuh diff --git a/include/kernels/activation_functions.cuh b/include/backend/cuda/kernels/activation_functions.cuh similarity index 100% rename from include/kernels/activation_functions.cuh rename to include/backend/cuda/kernels/activation_functions.cuh diff --git a/include/kernels/convolution.cuh b/include/backend/cuda/kernels/convolution.cuh similarity index 100% rename from include/kernels/convolution.cuh rename to include/backend/cuda/kernels/convolution.cuh diff --git a/include/kernels/matmul.cuh b/include/backend/cuda/kernels/matmul.cuh similarity index 100% rename from include/kernels/matmul.cuh rename to include/backend/cuda/kernels/matmul.cuh diff --git a/include/kernels/pool.cuh b/include/backend/cuda/kernels/pool.cuh similarity index 100% rename from include/kernels/pool.cuh rename to include/backend/cuda/kernels/pool.cuh diff --git a/src/backends/cuda/cuda_backend.cu b/src/backends/cuda/cuda_backend.cu index 8bc4fd9..805a163 100644 --- a/src/backends/cuda/cuda_backend.cu +++ b/src/backends/cuda/cuda_backend.cu @@ -3,7 +3,7 @@ #include #include -#include "backend/cuda.cuh" +#include "backend/cuda/cuda.cuh" cudaDeviceProp initializeCUDA() { int deviceCount; diff --git a/src/backends/cuda/kernels/activation_functions.cu b/src/backends/cuda/kernels/activation_functions.cu index 1512ec5..444fd3a 100644 --- a/src/backends/cuda/kernels/activation_functions.cu +++ b/src/backends/cuda/kernels/activation_functions.cu @@ -1,4 +1,4 @@ -#include "activation_functions.cuh" +#include "backend/cuda/kernels/activation_functions.cuh" using namespace CUDANet; diff --git a/src/backends/cuda/kernels/convolution.cu b/src/backends/cuda/kernels/convolution.cu index 4472325..c815dfe 100644 --- a/src/backends/cuda/kernels/convolution.cu +++ b/src/backends/cuda/kernels/convolution.cu @@ -1,6 +1,6 @@ #include -#include "convolution.cuh" +#include "backend/cuda/kernels/convolution.cuh" using namespace CUDANet; @@ -39,7 +39,7 @@ __global__ void Kernels::convolution( continue; } - int kernelIndex = + int kernel_idx = f * kernel_shape[0] * kernel_shape[1] * input_shape[2] + c * kernel_shape[0] * kernel_shape[1] + k * kernel_shape[1] + l; @@ -48,7 +48,7 @@ __global__ void Kernels::convolution( input_shape[1] + (j * stride_shape[1] + l - padding_shape[1]); - sum += d_kernel[kernelIndex] * d_input[inputIndex]; + sum += d_kernel[kernel_idx] * d_input[inputIndex]; } } } diff --git a/src/backends/cuda/kernels/matmul.cu b/src/backends/cuda/kernels/matmul.cu index f3ad0f1..23b039e 100644 --- a/src/backends/cuda/kernels/matmul.cu +++ b/src/backends/cuda/kernels/matmul.cu @@ -1,5 +1,5 @@ -#include "backend/cuda.cuh" -#include "matmul.cuh" +#include "backend/cuda/cuda.cuh" +#include "backend/cuda/kernels/matmul.cuh" using namespace CUDANet; diff --git a/src/backends/cuda/kernels/pool.cu b/src/backends/cuda/kernels/pool.cu index d8f5f5b..6e5c02a 100644 --- a/src/backends/cuda/kernels/pool.cu +++ b/src/backends/cuda/kernels/pool.cu @@ -1,5 +1,5 @@ #include "layer.hpp" -#include "pool.cuh" +#include "backend/cuda/kernels/pool.cuh" using namespace CUDANet; diff --git a/src/backends/cuda/layer_ops.cu b/src/backends/cuda/layer_ops.cu index 11210b2..0c71033 100644 --- a/src/backends/cuda/layer_ops.cu +++ b/src/backends/cuda/layer_ops.cu @@ -1,8 +1,8 @@ -#include "backend/cuda.cuh" -#include "kernels/activation_functions.cuh" -#include "kernels/convolution.cuh" -#include "kernels/matmul.cuh" -#include "kernels/pool.cuh" +#include "backend/cuda/cuda.cuh" +#include "backend/cuda/kernels/activation_functions.cuh" +#include "backend/cuda/kernels/convolution.cuh" +#include "backend/cuda/kernels/matmul.cuh" +#include "backend/cuda/kernels/pool.cuh" using namespace CUDANet::Backends; diff --git a/src/backends/cuda/tensor_ops.cu b/src/backends/cuda/tensor_ops.cu index ffd6e7a..979034a 100644 --- a/src/backends/cuda/tensor_ops.cu +++ b/src/backends/cuda/tensor_ops.cu @@ -1,8 +1,8 @@ #include #include "backend.hpp" -#include "backend/cuda.cuh" -#include "kernels/matmul.cuh" +#include "backend/cuda/cuda.cuh" +#include "backend/cuda/kernels/matmul.cuh" using namespace CUDANet::Backends;