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

Fixed required forwardDims() because input dims change

parent 7ec57b26
No related branches found
No related tags found
2 merge requests!610.2.2,!54Make forwardDims() optional and handle data dependency & moved several operators impl to core
Pipeline #43681 canceled
......@@ -103,6 +103,7 @@ TEST_CASE("[cpu/operator] Div", "[Div][CPU]") {
Tres->resize(dims);
Tres -> getImpl() -> setRawPtr(result, nb_elements);
op->forwardDims();
start = std::chrono::system_clock::now();
myDiv->forward();
end = std::chrono::system_clock::now();
......@@ -195,6 +196,7 @@ TEST_CASE("[cpu/operator] Div", "[Div][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
myDiv->forward();
end = std::chrono::system_clock::now();
......@@ -289,6 +291,7 @@ TEST_CASE("[cpu/operator] Div", "[Div][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
myDiv->forward();
end = std::chrono::system_clock::now();
......
......@@ -154,6 +154,7 @@ TEST_CASE("[cpu/operator] GlobalAveragePooling",
Tres->resize(dims_out);
Tres->getImpl()->setRawPtr(result, out_nb_elems);
op->forwardDims();
start = std::chrono::system_clock::now();
REQUIRE_NOTHROW(globAvgPool->forward());
end = std::chrono::system_clock::now();
......@@ -224,6 +225,7 @@ TEST_CASE("[cpu/operator] GlobalAveragePooling",
Tres->resize(dims_out);
Tres->getImpl()->setRawPtr(result, out_nb_elems);
op->forwardDims();
start = std::chrono::system_clock::now();
REQUIRE_NOTHROW(globAvgPool->forward());
end = std::chrono::system_clock::now();
......@@ -348,6 +350,7 @@ TEST_CASE("[cpu/operator] GlobalAveragePooling",
// results
Tres->resize(out_dims);
Tres->getImpl()->setRawPtr(result, out_nb_elems);
op->forwardDims();
start = std::chrono::system_clock::now();
REQUIRE_NOTHROW(globAvgPool->forward());
end = std::chrono::system_clock::now();
......@@ -534,6 +537,7 @@ TEST_CASE("[cpu/operator] GlobalAveragePooling",
// results
Tres->resize(out_dims);
Tres->getImpl()->setRawPtr(result, out_nb_elems);
op->forwardDims();
start = std::chrono::system_clock::now();
REQUIRE_NOTHROW(globAvgPool->forward());
end = std::chrono::system_clock::now();
......
......@@ -94,6 +94,7 @@ TEST_CASE("[cpu/operator] MatMul(forward)", "[MatMul][CPU]") {
op->associateInput(1, T2);
op->setDataType(DataType::Float32);
op->setBackend("cpu");
op->forwardDims();
start = std::chrono::system_clock::now();
myMatMul->forward();
end = std::chrono::system_clock::now();
......@@ -157,6 +158,7 @@ TEST_CASE("[cpu/operator] MatMul(forward)", "[MatMul][CPU]") {
op->associateInput(1, T2);
op->setDataType(DataType::Float32);
op->setBackend("cpu");
op->forwardDims();
start = std::chrono::system_clock::now();
myMatMul->forward();
end = std::chrono::system_clock::now();
......@@ -223,6 +225,7 @@ TEST_CASE("[cpu/operator] MatMul(forward)", "[MatMul][CPU]") {
op->associateInput(1, T2);
op->setDataType(DataType::Float32);
op->setBackend("cpu");
op->forwardDims();
start = std::chrono::system_clock::now();
myMatMul->forward();
end = std::chrono::system_clock::now();
......@@ -255,6 +258,7 @@ TEST_CASE("[cpu/operator] MatMul(forward)", "[MatMul][CPU]") {
op->setDataType(DataType::Float32);
op->setBackend("cpu");
op->forwardDims();
myMatMul->forward();
}
......
......@@ -103,6 +103,7 @@ TEST_CASE("[cpu/operator] Mul", "[Mul][CPU]") {
Tres->resize(dims);
Tres -> getImpl() -> setRawPtr(result, nb_elements);
op->forwardDims();
start = std::chrono::system_clock::now();
myMul->forward();
end = std::chrono::system_clock::now();
......@@ -195,6 +196,7 @@ TEST_CASE("[cpu/operator] Mul", "[Mul][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
myMul->forward();
end = std::chrono::system_clock::now();
......@@ -289,6 +291,7 @@ TEST_CASE("[cpu/operator] Mul", "[Mul][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
myMul->forward();
end = std::chrono::system_clock::now();
......
......@@ -104,6 +104,7 @@ TEST_CASE("[cpu/operator] Pow", "[Pow][CPU]") {
Tres->resize(dims);
Tres -> getImpl() -> setRawPtr(result, nb_elements);
op->forwardDims();
start = std::chrono::system_clock::now();
myPow->forward();
end = std::chrono::system_clock::now();
......@@ -196,6 +197,7 @@ TEST_CASE("[cpu/operator] Pow", "[Pow][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
myPow->forward();
end = std::chrono::system_clock::now();
......@@ -290,6 +292,7 @@ TEST_CASE("[cpu/operator] Pow", "[Pow][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
myPow->forward();
end = std::chrono::system_clock::now();
......
......@@ -103,6 +103,7 @@ TEST_CASE("[cpu/operator] Sub", "[Sub][CPU]") {
Tres->resize(dims);
Tres -> getImpl() -> setRawPtr(result, nb_elements);
op->forwardDims();
start = std::chrono::system_clock::now();
mySub->forward();
end = std::chrono::system_clock::now();
......@@ -195,6 +196,7 @@ TEST_CASE("[cpu/operator] Sub", "[Sub][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
mySub->forward();
end = std::chrono::system_clock::now();
......@@ -289,6 +291,7 @@ TEST_CASE("[cpu/operator] Sub", "[Sub][CPU]") {
Tres -> getImpl() -> setRawPtr(result, dimsOut[0]*dimsOut[1]*dimsOut[2]*dimsOut[3]);
// compute result
op->forwardDims();
start = std::chrono::system_clock::now();
mySub->forward();
end = std::chrono::system_clock::now();
......
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