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

Merge branch 'forwarddims' into 'dev'

Make forwardDims() optional and handle data dependency

See merge request !16
parents e510de2f bdca4ec3
No related branches found
No related tags found
2 merge requests!32version 0.2.1,!16Make forwardDims() optional and handle data dependency
Pipeline #44301 passed
......@@ -80,7 +80,6 @@ TEST_CASE("[gpu/operator] AvgPooling(forward)", "[AvgPooling][GPU]") {
op->associateInput(0,myInput);
op->setDataType(DataType::Float32);
op->setBackend("cuda");
op->computeOutputDims();
myAvgPool->forward();
float* computedOutput = new float[myOutput->size()]();
......@@ -113,7 +112,6 @@ TEST_CASE("[gpu/operator] AvgPooling(forward)", "[AvgPooling][GPU]") {
op->associateInput(0,myInput2);
op->setDataType(DataType::Float32);
op->setBackend("cuda");
op->computeOutputDims();
myAvgPool->forward();
float* computedOutput = new float[myOutput->size()]();
......@@ -147,7 +145,6 @@ TEST_CASE("[gpu/operator] AvgPooling(forward)", "[AvgPooling][GPU]") {
op->associateInput(0,myInput2);
op->setDataType(DataType::Float16);
op->setBackend("cuda");
op->computeOutputDims();
myAvgPool->forward();
half_float::half* computedOutput = new half_float::half[myOutput->size()]();
......
......@@ -53,7 +53,6 @@ TEST_CASE("[gpu/operator] Conv(forward)") {
op->associateInput(0,myInput);
op->associateInput(1,myWeights);
op->computeOutputDims();
myConv->forward();
REQUIRE(op->getOutput(0)->size() == 1);
......@@ -210,7 +209,6 @@ TEST_CASE("[gpu/operator] Conv(forward)") {
op->associateInput(0,myInput);
op->associateInput(1,myWeights);
op->associateInput(2,myBias);
op->computeOutputDims();
myConv->forward();
// op->getOutput(0)->print();
......
......@@ -68,7 +68,6 @@ TEST_CASE("[gpu/operator] FC(forward)", "[FC][GPU]") {
op->associateInput(0, myInput);
op -> setDataType(DataType::Float32);
op -> setBackend("cuda");
op->computeOutputDims();
myFC->forward();
float* computedOutput = new float[myOutput->size()]();
......@@ -117,7 +116,6 @@ TEST_CASE("[gpu/operator] FC(forward)", "[FC][GPU]") {
op->associateInput(0, myInput);
op -> setDataType(DataType::Float32);
op -> setBackend("cuda");
op->computeOutputDims();
myFC->forward();
float* computedOutput = new float[myOutput->size()]();
......
......@@ -77,7 +77,6 @@ TEST_CASE("[cpu/operator] MaxPooling(forward)", "[MaxPooling][CPU]") {
myMaxPool->getOperator()->associateInput(0,myInput);
myMaxPool->getOperator()->setDataType(DataType::Float32);
myMaxPool->getOperator()->setBackend("cuda");
op->computeOutputDims();
myMaxPool->forward();
float* computedOutput = new float[myOutput->size()]();
......
......@@ -37,7 +37,6 @@ TEST_CASE("[gpu/operator] ReLU(forward)", "[ReLU][GPU]") {
op->associateInput(0,input0);
op->setDataType(DataType::Float32);
op->setBackend("cuda");
op->computeOutputDims();
myReLU->forward();
float* computedOutput = new float[myOutput->size()]();
......@@ -70,7 +69,6 @@ TEST_CASE("[gpu/operator] ReLU(forward)", "[ReLU][GPU]") {
op->associateInput(0,input0);
op->setDataType(DataType::Float32);
op->setBackend("cuda");
op->computeOutputDims();
myReLU->forward();
float* computedOutput = new float[myOutput->size()]();
......@@ -115,7 +113,6 @@ TEST_CASE("[gpu/operator] ReLU(forward)", "[ReLU][GPU]") {
op->associateInput(0,input0);
op->setDataType(DataType::Float32);
op->setBackend("cuda");
op->computeOutputDims();
myReLU->forward();
float* computedOutput = new float[myOutput->size()]();
......@@ -184,7 +181,6 @@ TEST_CASE("[gpu/operator] ReLU(forward)", "[ReLU][GPU]") {
op->associateInput(0,input0);
op->setDataType(DataType::Float32);
op->setBackend("cuda");
op->computeOutputDims();
op->forward();
float* computedOutput = new float[myOutput->size()]();
......
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