Skip to content
Snippets Groups Projects
Commit 3bb18a2b authored by Maxence Naud's avatar Maxence Naud
Browse files

Fix includes

parent a1affaba
No related branches found
No related tags found
No related merge requests found
...@@ -9,12 +9,11 @@ ...@@ -9,12 +9,11 @@
* *
********************************************************************************/ ********************************************************************************/
#ifndef AIDGE_OPERATORIMPL_H_ #ifndef AIDGE_BACKEND_OPERATORIMPL_H_
#define AIDGE_OPERATORIMPL_H_ #define AIDGE_BACKEND_OPERATORIMPL_H_
#include <cstddef> #include <string>
#include <vector> #include <vector>
#include <memory>
#include "aidge/utils/Types.h" #include "aidge/utils/Types.h"
...@@ -83,4 +82,4 @@ protected: ...@@ -83,4 +82,4 @@ protected:
}; };
} // namespace Aidge } // namespace Aidge
#endif /* AIDGE_OPERATORIMPL_H_ */ #endif /* AIDGE_BACKEND_OPERATORIMPL_H_ */
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
#ifndef AIDGE_CORE_OPERATOR_MEMORIZE_H_ #ifndef AIDGE_CORE_OPERATOR_MEMORIZE_H_
#define AIDGE_CORE_OPERATOR_MEMORIZE_H_ #define AIDGE_CORE_OPERATOR_MEMORIZE_H_
#include <cassert>
#include <memory> #include <memory>
#include <string>
#include <vector> #include <vector>
#include "aidge/utils/Registrar.hpp"
#include "aidge/operator/OperatorTensor.hpp"
#include "aidge/backend/OperatorImpl.hpp" #include "aidge/backend/OperatorImpl.hpp"
#include "aidge/data/Tensor.hpp" #include "aidge/data/Tensor.hpp"
#include "aidge/graph/Node.hpp" #include "aidge/graph/Node.hpp"
#include "aidge/utils/Types.h" #include "aidge/operator/OperatorTensor.hpp"
#include "aidge/utils/Registrar.hpp"
#include "aidge/utils/StaticAttributes.hpp" #include "aidge/utils/StaticAttributes.hpp"
#include "aidge/utils/Types.h"
namespace Aidge { namespace Aidge {
enum class MemorizeAttr { ScheduleStep, ForwardStep, EndStep }; enum class MemorizeAttr { ScheduleStep, ForwardStep, EndStep };
...@@ -47,14 +47,19 @@ public: ...@@ -47,14 +47,19 @@ public:
} }
/** /**
* @brief Copy-constructor. Copy the operator attributes and its output tensor(s), but not its input tensors (the new operator has no input associated). * @brief Copy-constructor. Copy the operator attributes and its output tensor(s),
* but not its input tensors (the new operator has no input associated).
* @param op Operator to copy. * @param op Operator to copy.
*/ */
Memorize_Op(const Memorize_Op& op) Memorize_Op(const Memorize_Op& op)
: OperatorTensor(op), : OperatorTensor(op),
Attributes_(op) Attributes_(op)
{ {
mImpl = op.mImpl ? Registrar<Memorize_Op>::create(op.backend())(*this) : nullptr; if (op.mImpl) {
SET_IMPL_MACRO(Memorize_Op, *this, op.backend());
} else {
mImpl = nullptr;
}
mOutputs[1] = mOutputs[0]; mOutputs[1] = mOutputs[0];
} }
...@@ -66,10 +71,7 @@ public: ...@@ -66,10 +71,7 @@ public:
return std::make_shared<Memorize_Op>(*this); return std::make_shared<Memorize_Op>(*this);
} }
void setBackend(const std::string& name, DeviceIdx_t device = 0) override { void setBackend(const std::string& name, DeviceIdx_t device = 0) override final;
mImpl = Registrar<Memorize_Op>::create({name})(*this);
mOutputs[0]->setBackend(name, device);
}
void computeOutputDims() override; void computeOutputDims() override;
bool outputDimsForwarded() const override; bool outputDimsForwarded() const override;
...@@ -98,4 +100,4 @@ const char *const EnumStrings<Aidge::MemorizeAttr>::data[] = { ...@@ -98,4 +100,4 @@ const char *const EnumStrings<Aidge::MemorizeAttr>::data[] = {
}; };
} }
#endif /* AIDGE_CORE_OPERATOR_MEMORIZE_H_ */ #endif /* AIDGE_CORE_OPERATOR_MEMORIZE_H_ */
\ No newline at end of file
...@@ -9,9 +9,17 @@ ...@@ -9,9 +9,17 @@
* *
********************************************************************************/ ********************************************************************************/
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/operator/Memorize.hpp" #include "aidge/operator/Memorize.hpp"
#include <memory>
#include <string>
#include <vector>
#include "aidge/backend/OperatorImpl.hpp"
#include "aidge/data/Tensor.hpp"
#include "aidge/utils/ErrorHandling.hpp"
#include "aidge/utils/Types.h"
const std::string Aidge::Memorize_Op::Type = "Memorize"; const std::string Aidge::Memorize_Op::Type = "Memorize";
void Aidge::Memorize_Op::computeOutputDims() { void Aidge::Memorize_Op::computeOutputDims() {
...@@ -33,6 +41,11 @@ void Aidge::Memorize_Op::computeOutputDims() { ...@@ -33,6 +41,11 @@ void Aidge::Memorize_Op::computeOutputDims() {
} }
} }
void Aidge::Memorize_Op::setBackend(const std::string& name, Aidge::DeviceIdx_t device) {
mImpl = Registrar<Memorize_Op>::create({name})(*this);
mOutputs[0]->setBackend(name, device);
}
bool Aidge::Memorize_Op::outputDimsForwarded() const { bool Aidge::Memorize_Op::outputDimsForwarded() const {
// Only check the output dims // Only check the output dims
bool forwarded = true; bool forwarded = true;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <vector> #include <vector>
#include "aidge/backend/OperatorImpl.hpp" #include "aidge/backend/OperatorImpl.hpp"
#include "aidge/data/Tensor.hpp"
#include "aidge/operator/Pow.hpp" #include "aidge/operator/Pow.hpp"
#include "aidge/utils/Types.h" #include "aidge/utils/Types.h"
#include "aidge/utils/ErrorHandling.hpp" #include "aidge/utils/ErrorHandling.hpp"
......
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