From 045359cca2bf0ed86f6aa50cb3fcad0a88be2e6d Mon Sep 17 00:00:00 2001
From: LordMathis <matus@namesny.com>
Date: Thu, 29 Feb 2024 22:21:32 +0100
Subject: [PATCH] Remove not needed code

---
 include/kernels/activations.cuh         |  8 ++------
 src/kernels/activations.cu              | 18 +++---------------
 src/layers/dense.cu                     |  2 ++
 test/kernels/test_activations.cu        |  3 +--
 test/layers/test_dense.cu               |  3 +--
 test/test_utils/test_cublas_fixture.cu  |  5 +++--
 test/test_utils/test_cublas_fixture.cuh |  4 ++--
 7 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/include/kernels/activations.cuh b/include/kernels/activations.cuh
index b557681..5f7935b 100644
--- a/include/kernels/activations.cuh
+++ b/include/kernels/activations.cuh
@@ -1,16 +1,12 @@
-#include <functional>
-
 #ifndef ACTIVATIONS_H
 #define ACTIVATIONS_H
 
-__device__ float sigmoid(float a);
-__device__ float relu(float a);
-__device__ float linear(float a);
-
 __global__ void
 sigmoid_kernel(const float* __restrict__ src, float* __restrict__ dst, int len);
+
 __global__ void
 relu_kernel(const float* __restrict__ src, float* __restrict__ dst, int len);
+
 __global__ void
 linear_kernel(const float* __restrict__ src, float* __restrict__ dst, int len);
 
diff --git a/src/kernels/activations.cu b/src/kernels/activations.cu
index f48dc1c..0e8be1e 100644
--- a/src/kernels/activations.cu
+++ b/src/kernels/activations.cu
@@ -2,18 +2,6 @@
 
 #include "activations.cuh"
 
-__device__ float sigmoid(float a) {
-    return 1.0 / (1.0 + exp(-a));
-}
-
-__device__ float relu(float a) {
-    return a < 0.0 ? 0.0 : a;
-}
-
-__device__ float linear(float a) {
-    return a;
-}
-
 __global__ void sigmoid_kernel(
     const float* __restrict__ src,
     float* __restrict__ dst,
@@ -23,7 +11,7 @@ __global__ void sigmoid_kernel(
     int tid    = blockDim.x * blockIdx.x + threadIdx.x;
 
     for (int i = tid; i < len; i += stride) {
-        dst[i] = sigmoid(src[i]);
+        dst[i] = 1.0 / (1.0 + exp(-src[i]));
     }
 }
 
@@ -33,7 +21,7 @@ relu_kernel(const float* __restrict__ src, float* __restrict__ dst, int len) {
     int tid    = blockDim.x * blockIdx.x + threadIdx.x;
 
     for (int i = tid; i < len; i += stride) {
-        dst[i] = relu(src[i]);
+        dst[i] = src[i] < 0.0 ? 0.0 : src[i];
     }
 }
 
@@ -43,6 +31,6 @@ linear_kernel(const float* __restrict__ src, float* __restrict__ dst, int len) {
     int tid    = blockDim.x * blockIdx.x + threadIdx.x;
 
     for (int i = tid; i < len; i += stride) {
-        dst[i] = linear(src[i]);
+        dst[i] = src[i];
     }
 }
diff --git a/src/layers/dense.cu b/src/layers/dense.cu
index 1fe73ce..227b53b 100644
--- a/src/layers/dense.cu
+++ b/src/layers/dense.cu
@@ -81,6 +81,8 @@ void Layers::Dense::forward(const float* d_input, float* d_output) {
             d_output, d_output, outputSize
         );
     }
+
+    CUDA_CHECK(cudaDeviceSynchronize());
 }
 
 void Layers::Dense::toCuda() {
diff --git a/test/kernels/test_activations.cu b/test/kernels/test_activations.cu
index f633ab5..f5c0d87 100644
--- a/test/kernels/test_activations.cu
+++ b/test/kernels/test_activations.cu
@@ -1,10 +1,9 @@
 #include <cuda_runtime_api.h>
-#include <driver_types.h>
+#include <gtest/gtest.h>
 
 #include <iostream>
 
 #include "activations.cuh"
-#include "gtest/gtest.h"
 #include "test_cublas_fixture.cuh"
 
 class ActivationsTest : public CublasTestFixture {
diff --git a/test/layers/test_dense.cu b/test/layers/test_dense.cu
index cb224e4..8221ca1 100644
--- a/test/layers/test_dense.cu
+++ b/test/layers/test_dense.cu
@@ -1,11 +1,10 @@
 #include <cuda_runtime_api.h>
-#include <driver_types.h>
+#include <gtest/gtest.h>
 
 #include <iostream>
 
 #include "activations.cuh"
 #include "dense.cuh"
-#include "gtest/gtest.h"
 #include "test_cublas_fixture.cuh"
 
 class DenseLayerTest : public CublasTestFixture {
diff --git a/test/test_utils/test_cublas_fixture.cu b/test/test_utils/test_cublas_fixture.cu
index a1b8708..d76d198 100644
--- a/test/test_utils/test_cublas_fixture.cu
+++ b/test/test_utils/test_cublas_fixture.cu
@@ -1,5 +1,6 @@
-#include "cublas_v2.h"
-#include "gtest/gtest.h"
+#include <cublas_v2.h>
+#include <gtest/gtest.h>
+
 #include "test_cublas_fixture.cuh"
 
 cublasHandle_t CublasTestFixture::cublasHandle;
diff --git a/test/test_utils/test_cublas_fixture.cuh b/test/test_utils/test_cublas_fixture.cuh
index 51ed7a3..89d85af 100644
--- a/test/test_utils/test_cublas_fixture.cuh
+++ b/test/test_utils/test_cublas_fixture.cuh
@@ -1,5 +1,5 @@
-#include "cublas_v2.h"
-#include "gtest/gtest.h"
+#include <cublas_v2.h>
+#include <gtest/gtest.h>
 
 class CublasTestFixture : public ::testing::Test {
   protected: