Commit 58e56d81 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko
Browse files

Merge branch 'stdvectorfix' into 'master'

Fixed std namespace prefix for vectors in predictor template

See merge request CNNArch2MXNet!3
parents aaa745b1 8ac5c90c
......@@ -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());
......
......@@ -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());
......
......@@ -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());
......
......@@ -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());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment