From 66cf9eb573fdaede448b03253a50caeca8fe740a Mon Sep 17 00:00:00 2001
From: hrouis <houssemeddine.rouis92@gmail.com>
Date: Tue, 24 Sep 2024 14:13:01 +0200
Subject: [PATCH] clean headers
---
src/loss/classification/BCE.cpp | 8 --------
src/loss/regression/MSE.cpp | 4 ----
unit_tests/loss/classification/Test_BCE.cpp | 4 ++++
unit_tests/loss/regression/Test_MSE.cpp | 8 +++++++-
unit_tests/metrics/Test_Accuracy.cpp | 7 ++++---
unit_tests/optimizer/Test_Adam.cpp | 18 +++++++++---------
6 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/loss/classification/BCE.cpp b/src/loss/classification/BCE.cpp
index 296d466..4ef1d8f 100644
--- a/src/loss/classification/BCE.cpp
+++ b/src/loss/classification/BCE.cpp
@@ -28,14 +28,6 @@
#include "aidge/operator/Ln.hpp"
#include "aidge/operator/ReduceMean.hpp"
-#include "aidge/backend/cpu/operator/AddImpl.hpp"
-#include "aidge/backend/cpu/operator/SubImpl.hpp"
-#include "aidge/backend/cpu/operator/MulImpl.hpp"
-#include "aidge/backend/cpu/operator/DivImpl.hpp"
-#include "aidge/backend/cpu/operator/LnImpl.hpp"
-#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
-
-
Aidge::Tensor Aidge::loss::BCE(std::shared_ptr<Tensor>& prediction,
const std::shared_ptr<Tensor>& target) {
/*
diff --git a/src/loss/regression/MSE.cpp b/src/loss/regression/MSE.cpp
index 49a9df0..f6ad9cf 100644
--- a/src/loss/regression/MSE.cpp
+++ b/src/loss/regression/MSE.cpp
@@ -12,10 +12,6 @@
#include <memory>
#include <numeric> // std::iota
-#include "aidge/backend/cpu/operator/PowImpl.hpp"
-#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
-#include "aidge/backend/cpu/operator/SubImpl.hpp"
-#include "aidge/backend/cpu/operator/MulImpl.hpp"
#include "aidge/data/Tensor.hpp"
#include "aidge/graph/GraphView.hpp"
#include "aidge/graph/OpArgs.hpp"
diff --git a/unit_tests/loss/classification/Test_BCE.cpp b/unit_tests/loss/classification/Test_BCE.cpp
index 39e8012..cbcdc80 100644
--- a/unit_tests/loss/classification/Test_BCE.cpp
+++ b/unit_tests/loss/classification/Test_BCE.cpp
@@ -19,9 +19,13 @@
// std::uniform_int_distribution
#include <vector>
+#include "aidge/backend/cpu/operator/DivImpl.hpp"
+#include "aidge/backend/cpu/operator/LnImpl.hpp"
+#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
#include "aidge/loss/LossList.hpp"
#include "aidge/data/Tensor.hpp"
#include "aidge/utils/TensorUtils.hpp"
+
#if USE_AIDGE_BACKEND_CUDA
#include "aidge/backend/cuda/operator/DivImpl.hpp"
#include "aidge/backend/cuda/operator/LnImpl.hpp"
diff --git a/unit_tests/loss/regression/Test_MSE.cpp b/unit_tests/loss/regression/Test_MSE.cpp
index 4e30fd0..c0ecd4d 100644
--- a/unit_tests/loss/regression/Test_MSE.cpp
+++ b/unit_tests/loss/regression/Test_MSE.cpp
@@ -19,15 +19,21 @@
// std::uniform_int_distribution
#include <vector>
-#include "aidge/loss/LossList.hpp"
+#include "aidge/backend/cpu/operator/MulImpl.hpp"
+#include "aidge/backend/cpu/operator/PowImpl.hpp"
+#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
+#include "aidge/backend/cpu/operator/SubImpl.hpp"
#include "aidge/data/Tensor.hpp"
+#include "aidge/loss/LossList.hpp"
#include "aidge/utils/TensorUtils.hpp"
+
#if USE_AIDGE_BACKEND_CUDA
#include "aidge/backend/cuda/operator/PowImpl.hpp"
#include "aidge/backend/cuda/operator/ReduceMeanImpl.hpp"
#include "aidge/backend/cuda/operator/SubImpl.hpp"
#include "aidge/backend/cuda/operator/MulImpl.hpp"
#endif
+
namespace Aidge {
TEST_CASE("[loss/regression] MSE", "[loss][regression][MSE]") {
diff --git a/unit_tests/metrics/Test_Accuracy.cpp b/unit_tests/metrics/Test_Accuracy.cpp
index 8d849fe..fa33bd5 100644
--- a/unit_tests/metrics/Test_Accuracy.cpp
+++ b/unit_tests/metrics/Test_Accuracy.cpp
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2023 CEA-List
+ * Copyright (c) 2024 CEA-List
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
@@ -10,19 +10,20 @@
********************************************************************************/
#include <catch2/catch_test_macros.hpp>
-#include <cstddef> // std::size_t
#include <cmath> //
+#include <cstddef> // std::size_t
#include <functional> // std::multiplies, std::plus
#include <memory> // std::make_unique
#include <numeric> // std::accumulate
#include <random> // std::random_device, std::mt19937,
// std::uniform_int_distribution
#include <vector>
+
#include "aidge/backend/cpu/operator/ArgMaxImpl.hpp"
#include "aidge/backend/cpu/operator/AndImpl.hpp"
#include "aidge/backend/cpu/operator/ReduceSumImpl.hpp"
-#include "aidge/learning/metrics/Accuracy.hpp"
#include "aidge/data/Tensor.hpp"
+#include "aidge/learning/metrics/Accuracy.hpp"
#include "aidge/utils/TensorUtils.hpp"
#if USE_AIDGE_BACKEND_CUDA
diff --git a/unit_tests/optimizer/Test_Adam.cpp b/unit_tests/optimizer/Test_Adam.cpp
index 2e9eb8b..a3d7c4b 100644
--- a/unit_tests/optimizer/Test_Adam.cpp
+++ b/unit_tests/optimizer/Test_Adam.cpp
@@ -10,33 +10,33 @@
********************************************************************************/
#include <catch2/catch_test_macros.hpp>
-#include <cstddef> // std::size_t
#include <cmath> // std::sqrt, std::pow
+#include <cstddef> // std::size_t
#include <memory>
#include <random> // std::random_device, std::mt19937, std::uniform_int_distribution
#include <set>
#include <vector>
-#include "aidge/data/Tensor.hpp"
#include "aidge/backend/cpu/data/TensorImpl.hpp"
+#include "aidge/backend/cpu/operator/AddImpl.hpp"
+#include "aidge/backend/cpu/operator/DivImpl.hpp"
+#include "aidge/backend/cpu/operator/MulImpl.hpp"
+#include "aidge/backend/cpu/operator/SqrtImpl.hpp"
+#include "aidge/backend/cpu/operator/SubImpl.hpp"
+#include "aidge/data/Tensor.hpp"
#include "aidge/learning/learningRate/LRScheduler.hpp"
#include "aidge/learning/learningRate/LRSchedulerList.hpp"
#include "aidge/learning/optimizer/Optimizer.hpp"
#include "aidge/learning/optimizer/Adam.hpp"
-#include "aidge/backend/cpu/operator/AddImpl.hpp"
-#include "aidge/backend/cpu/operator/MulImpl.hpp"
-#include "aidge/backend/cpu/operator/SubImpl.hpp"
-#include "aidge/backend/cpu/operator/DivImpl.hpp"
-#include "aidge/backend/cpu/operator/SqrtImpl.hpp"
#include "aidge/utils/TensorUtils.hpp"
#if USE_AIDGE_BACKEND_CUDA
#include "aidge/backend/cuda/data/TensorImpl.hpp"
#include "aidge/backend/cuda/operator/AddImpl.hpp"
-#include "aidge/backend/cuda/operator/MulImpl.hpp"
-#include "aidge/backend/cuda/operator/SubImpl.hpp"
#include "aidge/backend/cuda/operator/DivImpl.hpp"
+#include "aidge/backend/cuda/operator/MulImpl.hpp"
#include "aidge/backend/cuda/operator/SqrtImpl.hpp"
+#include "aidge/backend/cuda/operator/SubImpl.hpp"
#endif
namespace Aidge {
--
GitLab