From 90fa44467fe1b2d582169682995e18e84a62a305 Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Wed, 4 Oct 2023 14:02:29 +0200
Subject: [PATCH] Fixed missing changes
---
include/aidge/backend/cpu/operator/ScalingImpl.hpp | 5 +++--
.../backend/cpu/operator/ScalingImpl_forward_kernels.hpp | 4 ++--
src/operator/ScalingImpl.cpp | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/aidge/backend/cpu/operator/ScalingImpl.hpp b/include/aidge/backend/cpu/operator/ScalingImpl.hpp
index c6ef9585..37549349 100644
--- a/include/aidge/backend/cpu/operator/ScalingImpl.hpp
+++ b/include/aidge/backend/cpu/operator/ScalingImpl.hpp
@@ -18,16 +18,17 @@
#include "aidge/utils/Types.h"
#include <memory>
#include <vector>
+#include <array>
namespace Aidge {
// class Scaling_Op;
// compute kernel registry for forward and backward
class ScalingImplForward_cpu
- : public Registrable<ScalingImplForward_cpu, std::tuple<DataType, DataType>, void(const Scaling_Op::Attributes&, std::size_t, const void*, void*)> {
+ : public Registrable<ScalingImplForward_cpu, std::tuple<DataType, DataType>, void(const Scaling_Op::Attrs&, std::size_t, const void*, void*)> {
};
class ScalingImplBackward_cpu
- : public Registrable<ScalingImplBackward_cpu, std::tuple<DataType, DataType>, void(const Scaling_Op::Attributes&, std::size_t, const void*, void*)> {
+ : public Registrable<ScalingImplBackward_cpu, std::tuple<DataType, DataType>, void(const Scaling_Op::Attrs&, std::size_t, const void*, void*)> {
};
class ScalingImpl_cpu : public OperatorImpl {
diff --git a/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp b/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp
index e517f0a0..8fe13bce 100644
--- a/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp
+++ b/include/aidge/backend/cpu/operator/ScalingImpl_forward_kernels.hpp
@@ -18,14 +18,14 @@
namespace Aidge {
template <class I, class O>
-void ScalingImpl_cpu_forward_kernel(const Scaling_Op::Attributes& attrs,
+void ScalingImpl_cpu_forward_kernel(const Scaling_Op::Attrs& attrs,
std::size_t inputLenght,
const void* input_,
void* output_) {
const I* input = static_cast<const I*>(input_);
O* output = static_cast<O*>(output_);
- I scalingFactor = static_cast<I>(std::get<0>(attrs));
+ const I& scalingFactor = static_cast<const I&>(std::get<0>(attrs));
for (std::size_t i = 0; i < inputLenght; ++i) {
output[i] = input[i] * scalingFactor;
diff --git a/src/operator/ScalingImpl.cpp b/src/operator/ScalingImpl.cpp
index c6a96f3b..84cd6ee3 100644
--- a/src/operator/ScalingImpl.cpp
+++ b/src/operator/ScalingImpl.cpp
@@ -68,7 +68,7 @@ void Aidge::ScalingImpl_cpu::forward() {
mOp.getOutput(0)->dataType()});
// Call kernel
- kernelFunc(mOp.getParams(),
+ kernelFunc(mOp.getStaticAttributes(),
std::static_pointer_cast<Tensor>(mOp.getInput(0))->size(),
mOp.getInput(0)->getImpl()->rawPtr(),
mOp.getOutput(0)->getImpl()->rawPtr());
--
GitLab