Merge branch 'dev-0.2'

RidgeRun · Jun 5, 2019 · e7c6d2d · e7c6d2d
2 parents 43eed5c + 509c831
commit e7c6d2d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -10,7 +10,7 @@
 
 # Initialize autoconf.
 AC_PREREQ([2.69])
-AC_INIT([RidgeRun inference library],[0.1.0],[https://github.com/RidgeRun/r2inference/issues],[r2inference])
+AC_INIT([RidgeRun inference library],[0.2.0],[https://github.com/RidgeRun/r2inference/issues],[r2inference])
 
 # Initialize our build utils
 RR_INIT

diff --git a/r2i/tensorflow/frame.cc b/r2i/tensorflow/frame.cc
@@ -191,6 +191,11 @@ RuntimeError Frame::GetTensorShape (std::shared_ptr<TF_Graph> pgraph,
     return error;
   }
 
+  /* R2Inference uses a batch size of 1 but some tensors have this value set to
+   * generic (-1) or greater than 1.
+   * Batch size set to 1 for general compatibility support. */
+  (*dims)[0] = 1;
+
   type = TF_OperationOutputType(output);
   size = TF_DataTypeSize(type);
 

diff --git a/r2i/tensorflow/prediction.cc b/r2i/tensorflow/prediction.cc
@@ -72,6 +72,11 @@ RuntimeError Prediction::SetTensor (std::shared_ptr<TF_Graph> pgraph,
     return error;
   }
 
+  /* R2Inference uses a batch size of 1 but some tensors have this value set to
+   * generic (-1) or greater than 1.
+   * Batch size set to 1 for general compatibility support. */
+  dims[0] = 1;
+
   TF_DataType type = TF_OperationOutputType(output);
   size_t type_size = TF_DataTypeSize(type);
   size_t data_size = this->GetRequiredBufferSize (output, dims, num_dims);