Skip to content
Snippets Groups Projects
Commit 54e1a95b authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Merge branch 'master' of gitlab.eclipse.org:eclipse/aidge/aidge_backend_cpu

parents d3d6d263 61307e84
No related branches found
No related tags found
No related merge requests found
Pipeline #30958 failed
Showing
with 66 additions and 66 deletions
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_IMPORTS_H__
#define __AIDGE_CPU_IMPORTS_H__
#ifndef AIDGE_CPU_IMPORTS_H_
#define AIDGE_CPU_IMPORTS_H_
#include "aidge/data/TensorImpl.hpp"
#include "aidge/operator/AddImpl.hpp"
......@@ -24,4 +24,4 @@
#include "aidge/operator/ReLUImpl.hpp"
#include "aidge/operator/SoftmaxImpl.hpp"
#endif /* __AIDGE_CPU_IMPORTS_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_IMPORTS_H_ */
\ No newline at end of file
#ifndef __AIDGE_CPU_DATA_TENSORIMPL_H__
#define __AIDGE_CPU_DATA_TENSORIMPL_H__
#ifndef AIDGE_CPU_DATA_TENSORIMPL_H_
#define AIDGE_CPU_DATA_TENSORIMPL_H_
#include "aidge/backend/TensorImpl.hpp"
#include "aidge/data/Tensor.hpp"
......@@ -72,4 +72,4 @@ static Registrar<Tensor> registrarTensorImpl_cpu_Int32(
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_DATA_TENSORIMPL_H__ */
#endif /* AIDGE_CPU_DATA_TENSORIMPL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_ADDIMPL_H__
#define __AIDGE_CPU_OPERATOR_ADDIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_ADDIMPL_H_
#define AIDGE_CPU_OPERATOR_ADDIMPL_H_
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/operator/Add.hpp"
......@@ -203,4 +203,4 @@ static Registrar<Add_Op<3>> registrarAddImpl3I_cpu("cpu", Aidge::AddImpl_cpu<3>:
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_ADDIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_ADDIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_ADDIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_ADDIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_ADDIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_ADDIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -84,4 +84,4 @@ static Registrar<AddImplForward_cpu<3>> registrarAddImpl3IForward_cpu_Float64(
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_ADDIMPL_CPU_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_ADDIMPL_CPU_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_H__
#define __AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_H_
#define AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_H_
#include <array>
#include <memory>
......@@ -66,4 +66,4 @@ static Registrar<AvgPooling_Op<2>> registrarAvgPoolingImpl2D_cpu("cpu", Aidge::A
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -40,7 +40,7 @@ void AvgPoolingImpl2D_cpu_forward_kernel(const AvgPooling_Op<2>::Parameters &par
const I *input = static_cast<const I *>(input_);
O *output = static_cast<O *>(output_);
// output H size
const std::size_t oxSize =
static_cast<std::size_t>(std::floor(static_cast<float>(dims[2] + std::get<2>(params)[0] + std::get<2>(params)[2] - std::get<1>(params)[0] + std::get<0>(params)[0]) /
......@@ -111,4 +111,4 @@ static Registrar<AvgPoolingImpl2DForward_cpu> registrarAvgPoolingImpl2DForward_c
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_AVGPOOLINGIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_BATCHNORMIMPL_H__
#define __AIDGE_CPU_OPERATOR_BATCHNORMIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_BATCHNORMIMPL_H_
#define AIDGE_CPU_OPERATOR_BATCHNORMIMPL_H_
#include <array>
#include <memory>
......@@ -81,4 +81,4 @@ static Registrar<BatchNorm_Op<2>> registrarBatchNormImpl2D_cpu("cpu", Aidge::Bat
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_BATCHNORMIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_BATCHNORMIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_BATCHNORMIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_BATCHNORMIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_BATCHNORMIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_BATCHNORMIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -78,7 +78,7 @@ void BatchNormImpl2D_cpu_forward_kernel(const BatchNorm_Op<2>::Parameters &param
sumSquare += input[ioIndex + feature] * input[ioIndex + feature];
}
}
const I inputMean = sum / static_cast<I>(nbDataPerChannel);
const I inputMean = sum / static_cast<I>(nbDataPerChannel);
const I inputVar = sumSquare / static_cast<I>(nbDataPerChannel) - inputMean*inputMean;
batchMean[ch] = batchMean[ch]*(1-std::get<1>(params)) + inputMean*std::get<1>(params);
......@@ -106,4 +106,4 @@ static Registrar<BatchNormImpl2DForward_cpu> registrarBatchNormImpl2DForward_cpu
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_BATCHNORMIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_BATCHNORMIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_H__
#define __AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_H_
#define AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_H_
#include <array>
#include <memory>
......@@ -68,4 +68,4 @@ static Registrar<ConvDepthWise_Op<2>> registrarConvDepthWiseImpl2D_cpu("cpu", Ai
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMP_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMP_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -43,7 +43,7 @@ void ConvDepthWiseImpl2D_cpu_forward_kernel(const ConvDepthWise_Op<2>::Parameter
const B *biases = static_cast<const B *>(biases_);
O *output = static_cast<O *>(output_);
// output H size
const std::size_t oxSize =
static_cast<std::size_t>(std::floor(static_cast<float>(dims[2] + std::get<4>(params)[0] + std::get<4>(params)[2] - std::get<3>(params)[0] + std::get<0>(params)[0]) /
......@@ -91,7 +91,7 @@ void ConvDepthWiseImpl2D_cpu_forward_kernel(const ConvDepthWise_Op<2>::Parameter
} else {
for (std::size_t sx = sxMin; sx < sxMax; ++sx) {
for (std::size_t sy = syMin; sy < syMax; ++sy) {
output[oIndexFull] += weights[wIndex + sx*std::get<3>(params)[1] + sy] *
output[oIndexFull] += weights[wIndex + sx*std::get<3>(params)[1] + sy] *
input[iIndex + static_cast<std::size_t>(ix+static_cast<signedsize>(sx))*dims[3] + static_cast<std::size_t>(iy+static_cast<signedsize>(sy))];
}
}
......@@ -115,4 +115,4 @@ static Registrar<ConvDepthWiseImpl2DForward_cpu> registrarConvDepthWiseImpl2DFor
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_CONVDEPTHWISEIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_CONVIMPL_H__
#define __AIDGE_CPU_OPERATOR_CONVIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_CONVIMPL_H_
#define AIDGE_CPU_OPERATOR_CONVIMPL_H_
#include <array>
#include <memory>
......@@ -68,4 +68,4 @@ static Registrar<Conv_Op<2>> registrarConvImpl2D_cpu("cpu", Aidge::ConvImpl2D_cp
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_CONVIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_CONVIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_CONVIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_CONVIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_CONVIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_CONVIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -85,7 +85,7 @@ void ConvImpl2D_cpu_forward_kernel(const Conv_Op<2>::Parameters &params, const s
}
*/
// output H size
const std::size_t oxSize =
static_cast<std::size_t>(std::floor(static_cast<float>(dims[2] + std::get<5>(params)[0] + std::get<5>(params)[2] - std::get<4>(params)[0] + std::get<0>(params)[0]) /
......@@ -134,7 +134,7 @@ void ConvImpl2D_cpu_forward_kernel(const Conv_Op<2>::Parameters &params, const s
} else {
for (std::size_t sx = sxMin; sx < sxMax; ++sx) {
for (std::size_t sy = syMin; sy < syMax; ++sy) {
output[oIndexFull] += weights[wIndex + sx*std::get<4>(params)[1] + sy] *
output[oIndexFull] += weights[wIndex + sx*std::get<4>(params)[1] + sy] *
input[iIndex + static_cast<std::size_t>(ix+static_cast<signedsize>(sx))*dims[3] + static_cast<std::size_t>(iy+static_cast<signedsize>(sy))];
}
}
......@@ -159,4 +159,4 @@ static Registrar<ConvImpl2DForward_cpu> registrarConvImpl2DForward_cpu_Float64(
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_CONVIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_CONVIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_FCIMPL_H__
#define __AIDGE_CPU_OPERATOR_FCIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_FCIMPL_H_
#define AIDGE_CPU_OPERATOR_FCIMPL_H_
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/operator/FC.hpp"
......@@ -61,4 +61,4 @@ static Registrar<FC_Op> registrarFCImpl_cpu("cpu", Aidge::FCImpl_cpu::create);
}
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_FCIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_FCIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_FCIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_FCIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_FCIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_FCIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
#include <algorithm>
......@@ -125,4 +125,4 @@ static Registrar<FCImplForward_cpu> registrarFCImpl2DForward_cpu_Float64(
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_FCIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_FCIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_H__
#define __AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_H_
#define AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_H_
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/operator/LeakyReLU.hpp"
......@@ -60,4 +60,4 @@ static Registrar<LeakyReLU_Op> registrarLeakyReLUImpl_cpu("cpu", Aidge::LeakyReL
}
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -42,4 +42,4 @@ static Registrar<LeakyReLUImplForward_cpu> registrarLeakyReLUImplForward_cpu_Flo
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_PRODUCERIMPL_H__
#define __AIDGE_CPU_OPERATOR_PRODUCERIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_PRODUCERIMPL_H_
#define AIDGE_CPU_OPERATOR_PRODUCERIMPL_H_
#include <memory>
......@@ -48,4 +48,4 @@ static Registrar<Producer_Op> registrarProducer1DImpl_cpu("cpu", Aidge::Producer
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_PRODUCERIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_PRODUCERIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_RELUIMPL_H__
#define __AIDGE_CPU_OPERATOR_RELUIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_RELUIMPL_H_
#define AIDGE_CPU_OPERATOR_RELUIMPL_H_
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/operator/ReLU.hpp"
......@@ -60,4 +60,4 @@ static Registrar<ReLU_Op> registrarReLUImpl_cpu("cpu", Aidge::ReLUImpl_cpu::crea
}
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_RELUIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_RELUIMPL_H_ */
\ No newline at end of file
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_RELUIMPL_FORWARD_KERNEL_H__
#define __AIDGE_CPU_OPERATOR_RELUIMPL_FORWARD_KERNEL_H__
#ifndef AIDGE_CPU_OPERATOR_RELUIMPL_FORWARD_KERNEL_H_
#define AIDGE_CPU_OPERATOR_RELUIMPL_FORWARD_KERNEL_H_
#include "aidge/utils/Registrar.hpp"
......@@ -40,4 +40,4 @@ static Registrar<ReLUImplForward_cpu> registrarReLUImplForward_cpu_Float64(
} // namespace
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_RELUIMPL_FORWARD_KERNEL_H__ */
#endif /* AIDGE_CPU_OPERATOR_RELUIMPL_FORWARD_KERNEL_H_ */
......@@ -9,8 +9,8 @@
*
********************************************************************************/
#ifndef __AIDGE_CPU_OPERATOR_SOFTMAXIMPL_H__
#define __AIDGE_CPU_OPERATOR_SOFTMAXIMPL_H__
#ifndef AIDGE_CPU_OPERATOR_SOFTMAXIMPL_H_
#define AIDGE_CPU_OPERATOR_SOFTMAXIMPL_H_
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/operator/Softmax.hpp"
......@@ -60,4 +60,4 @@ static Registrar<Softmax_Op> registrarSoftmaxImpl_cpu("cpu", Aidge::SoftmaxImpl_
}
} // namespace Aidge
#endif /* __AIDGE_CPU_OPERATOR_SOFTMAXIMPL_H__ */
\ No newline at end of file
#endif /* AIDGE_CPU_OPERATOR_SOFTMAXIMPL_H_ */
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment