bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create an intermediate representation.

Browse Source 
This way the visualiser does not need to know all about caffe, and can
just work on the intermediate representation which is a lot easier on
the compiler.
This commit is contained in:
Bert Peters
2017-10-12 14:21:53 +02:00
parent c725fcb8df
commit 19390f8d4f
6 changed files with 157 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Simulator.cpp
View File

@@ -28,8 +28,10 @@ Simulator::Simulator(const string& model_file, const string& weights_file, const
}
vector<Simulator::DType> Simulator::simulate(const string& image_file)
vector<LayerData> Simulator::simulate(const string& image_file)
{
typedef LayerData::Type LType;
cv::Mat im = cv::imread(image_file, -1);
assert(!im.empty());
@@ -41,10 +43,20 @@ vector<Simulator::DType> Simulator::simulate(const string& image_file)
net.Forward();
Blob<DType> *output_layer = net.output_blobs()[0];
const DType *begin = output_layer->cpu_data();
const DType *end = begin + output_layer->channels();
vector<DType> result(begin, end);
vector<LayerData> result;
Blob<DType>* input_layer = net.input_blobs()[0];
const auto& names = net.layer_names();
const auto& results = net.top_vecs();
const auto& layers = net.layers();
for (unsigned int i = 0; i < names.size(); ++i) {
CHECK_EQ(results[i].size(), 1) << "Multiple outputs per layer are not supported!" << endl;
const auto blob = results[i][0];
result.emplace_back(names[i], blob->shape(), blob->cpu_data(), LayerData::typeFromString(layers[i]->type()));
}
return result;
}
@@ -67,10 +79,6 @@ vector<cv::Mat> Simulator::getWrappedInputLayer()
}
static cv::Mat fix_channels(const int num_channels, cv::Mat original) {
if (num_channels == original.channels()) {
return original;
}
cv::Mat converted;
if (num_channels == 1 && original.channels() == 3) {
@@ -82,8 +90,8 @@ static cv::Mat fix_channels(const int num_channels, cv::Mat original) {
} else if (num_channels == 3 && original.channels() == 4) {
cv::cvtColor(original, converted, cv::COLOR_BGRA2BGR);
} else {
// Don't know how to convert.
abort();
CHECK(num_channels == original.channels()) << "Cannot convert between channel types. ";
return original;
}
return converted;