Merge branch 'stdvectorfix' into 'master'

Fixed std namespace prefix for vectors in predictor template

See merge request CNNArch2MXNet!3

src/main/resources/templates/CNNPredictor.ftl

@@ -28,8 +28,8 @@ public:
         if(handle) MXPredFree(handle);
     }
 
-    void predict(${tc.join(tc.architectureInputs, ", ", "const vector<float> &", "")},
-                 ${tc.join(tc.architectureOutputs, ", ", "vector<float> &", "")}){
+    void predict(${tc.join(tc.architectureInputs, ", ", "const std::vector<float> &", "")},
+                 ${tc.join(tc.architectureOutputs, ", ", "std::vector<float> &", "")}){
 <#list tc.architectureInputs as inputName>
         MXPredSetInput(handle, "data", ${inputName}.data(), ${inputName}.size());
         //MXPredSetInput(handle, "${inputName}", ${inputName}.data(), ${inputName}.size());

src/test/resources/target_code/CNNPredictor_Alexnet.h

@@ -28,8 +28,8 @@ public:
         if(handle) MXPredFree(handle);
     }
 
-    void predict(const vector<float> &data,
-                 vector<float> &predictions){
+    void predict(const std::vector<float> &data,
+                 std::vector<float> &predictions){
         MXPredSetInput(handle, "data", data.data(), data.size());
         //MXPredSetInput(handle, "data", data.data(), data.size());
 

src/test/resources/target_code/CNNPredictor_CifarClassifierNetwork.h

@@ -28,8 +28,8 @@ public:
         if(handle) MXPredFree(handle);
     }
 
-    void predict(const vector<float> &data,
-                 vector<float> &softmax){
+    void predict(const std::vector<float> &data,
+                 std::vector<float> &softmax){
         MXPredSetInput(handle, "data", data.data(), data.size());
         //MXPredSetInput(handle, "data", data.data(), data.size());
 

src/test/resources/target_code/CNNPredictor_VGG16.h

@@ -28,8 +28,8 @@ public:
         if(handle) MXPredFree(handle);
     }
 
-    void predict(const vector<float> &data,
-                 vector<float> &predictions){
+    void predict(const std::vector<float> &data,
+                 std::vector<float> &predictions){
         MXPredSetInput(handle, "data", data.data(), data.size());
         //MXPredSetInput(handle, "data", data.data(), data.size());