Skip to content
Snippets Groups Projects

Fix Reshape

Merged Houssem ROUIS requested to merge hrouis/aidge_core:fix_reshape into dev
All threads resolved!
1 file
+ 10
2
Compare changes
  • Side-by-side
  • Inline
@@ -23,6 +23,9 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
@@ -23,6 +23,9 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
std::shared_ptr<Tensor> input = std::make_shared<Tensor>(Array1D<float,6> {
std::shared_ptr<Tensor> input = std::make_shared<Tensor>(Array1D<float,6> {
{1.0, 2.0, 3.0, 4.0, 5.0, 6.0}
{1.0, 2.0, 3.0, 4.0, 5.0, 6.0}
});
});
 
std::shared_ptr<Tensor> shape = std::make_shared<Tensor>(Array1D<float,2> {
 
{2, 3}
 
});
std::shared_ptr<Tensor> expectedOutput = std::make_shared<Tensor>(Array2D<float,2,3> {
std::shared_ptr<Tensor> expectedOutput = std::make_shared<Tensor>(Array2D<float,2,3> {
{
{
{1.0, 2.0, 3.0},
{1.0, 2.0, 3.0},
@@ -30,9 +33,10 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
@@ -30,9 +33,10 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
}
}
});
});
std::shared_ptr<Node> myReshape = Reshape({2, 3});
std::shared_ptr<Node> myReshape = Reshape();
auto op = std::static_pointer_cast<OperatorTensor>(myReshape -> getOperator());
auto op = std::static_pointer_cast<OperatorTensor>(myReshape -> getOperator());
op->associateInput(0, input);
op->associateInput(0, input);
 
op->associateInput(1, shape);
op->setDataType(DataType::Float32);
op->setDataType(DataType::Float32);
op->setBackend("cpu");
op->setBackend("cpu");
myReshape->forward();
myReshape->forward();
@@ -47,6 +51,9 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
@@ -47,6 +51,9 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
}
}
});
});
 
std::shared_ptr<Tensor> shape = std::make_shared<Tensor>(Array1D<float,2> {
 
{3, 2}
 
});
std::shared_ptr<Tensor> expectedOutput = std::make_shared<Tensor>(Array2D<float,3,2> {
std::shared_ptr<Tensor> expectedOutput = std::make_shared<Tensor>(Array2D<float,3,2> {
{
{
{1.0, 2.0},
{1.0, 2.0},
@@ -55,9 +62,10 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
@@ -55,9 +62,10 @@ TEST_CASE("[cpu/operator] Reshape(forward)") {
}
}
});
});
std::shared_ptr<Node> myReshape = Reshape({3, 2});
std::shared_ptr<Node> myReshape = Reshape();
auto op = std::static_pointer_cast<OperatorTensor>(myReshape -> getOperator());
auto op = std::static_pointer_cast<OperatorTensor>(myReshape -> getOperator());
op->associateInput(0, input);
op->associateInput(0, input);
 
op->associateInput(1, shape);
op->setDataType(DataType::Float32);
op->setDataType(DataType::Float32);
op->setBackend("cpu");
op->setBackend("cpu");
myReshape->forward();
myReshape->forward();
Loading