Skip to content
Snippets Groups Projects
Commit d22f9e54 authored by Jerome Hue's avatar Jerome Hue Committed by Olivier BICHLER
Browse files

chore: Format files

parent 0f82d43c
No related branches found
No related tags found
2 merge requests!279v0.4.0,!256Add a Stack operator
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
namespace Aidge { namespace Aidge {
// TODO: Check why getRequiredMemory is always called with empty vector as
// inputSize
Aidge::Elts_t Aidge::StackProdConso::getRequiredMemory( Aidge::Elts_t Aidge::StackProdConso::getRequiredMemory(
const Aidge::IOIndex_t inputIdx, const Aidge::IOIndex_t inputIdx,
const std::vector<DimSize_t> &inputsSize) const { const std::vector<DimSize_t> &inputsSize) const {
...@@ -39,7 +41,8 @@ void StackOpImpl::forward() { ...@@ -39,7 +41,8 @@ void StackOpImpl::forward() {
const StackOp &op = dynamic_cast<const StackOp &>(mOp); const StackOp &op = dynamic_cast<const StackOp &>(mOp);
AIDGE_ASSERT(op.getInput(0), "missing input #0"); AIDGE_ASSERT(op.getInput(0), "missing input #0");
AIDGE_ASSERT((op.forwardStep() < op.maxElements()), AIDGE_ASSERT((op.forwardStep() < op.maxElements()),
"cannot forward anymore, maximum number of elements to stack exceeded"); "cannot forward anymore, maximum number of elements to stack "
"exceeded");
op.getOutput(0)->getImpl()->copy( op.getOutput(0)->getImpl()->copy(
op.getInput(0)->getImpl()->rawPtr(), op.getInput(0)->getImpl()->rawPtr(),
...@@ -53,7 +56,9 @@ StackOp::StackOp(std::uint32_t maxElements) ...@@ -53,7 +56,9 @@ StackOp::StackOp(std::uint32_t maxElements)
attr<StackAttr::MaxElements>(maxElements), attr<StackAttr::MaxElements>(maxElements),
attr<StackAttr::ForwardStep>(0))) { attr<StackAttr::ForwardStep>(0))) {
if (maxElements == 0) { if (maxElements == 0) {
AIDGE_THROW_OR_ABORT(std::invalid_argument, "StackOp creation failed: maxElements must be greater than 0."); AIDGE_THROW_OR_ABORT(
std::invalid_argument,
"StackOp creation failed: maxElements must be greater than 0.");
} }
mImpl = std::make_shared<StackOpImpl>(*this); mImpl = std::make_shared<StackOpImpl>(*this);
} }
......
...@@ -140,7 +140,8 @@ TEST_CASE("[core/operator] Stack(forward)", "[Stack]") { ...@@ -140,7 +140,8 @@ TEST_CASE("[core/operator] Stack(forward)", "[Stack]") {
for (std::size_t i = 0; i < numTensors; ++i) { for (std::size_t i = 0; i < numTensors; ++i) {
Tensor outputTensor = output->extract( Tensor outputTensor = output->extract(
{static_cast<std::uint64_t>(static_cast<int>(i))}); {static_cast<std::uint64_t>(static_cast<int>(i))});
Tensor inputTensor(DataType::Float32); inputTensor.resize(dimsIn); Tensor inputTensor(DataType::Float32);
inputTensor.resize(dimsIn);
inputTensor.setBackend("cpu"); inputTensor.setBackend("cpu");
inputTensor.getImpl()->setRawPtr(arrays[i], nbElems); inputTensor.getImpl()->setRawPtr(arrays[i], nbElems);
...@@ -152,16 +153,14 @@ TEST_CASE("[core/operator] Stack(forward)", "[Stack]") { ...@@ -152,16 +153,14 @@ TEST_CASE("[core/operator] Stack(forward)", "[Stack]") {
extraTensor->resize(dimsIn); extraTensor->resize(dimsIn);
extraTensor->setBackend("cpu"); extraTensor->setBackend("cpu");
extraTensor->setDataType(DataType::Float32); extraTensor->setDataType(DataType::Float32);
float* extraArray = new float[nbElems]; float *extraArray = new float[nbElems];
for (std::size_t j = 0; j < nbElems; ++j) { for (std::size_t j = 0; j < nbElems; ++j) {
extraArray[j] = valueDist(gen); extraArray[j] = valueDist(gen);
} }
extraTensor->getImpl()->setRawPtr(extraArray, nbElems); extraTensor->getImpl()->setRawPtr(extraArray, nbElems);
REQUIRE_THROWS_AS( REQUIRE_THROWS_AS((op->associateInput(0, extraTensor), op->forward()),
(op->associateInput(0, extraTensor), op->forward()), std::runtime_error);
std::runtime_error
);
// Clean up // Clean up
delete[] extraArray; delete[] extraArray;
......
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