YoloRT save bias, mask and clasesName into RT file

This commit is contained in:
Francesco Gatti
2022-03-30 20:46:51 +02:00
parent fa9db167b8
commit 5e71b99265
15 changed files with 104 additions and 79 deletions
+54 -1
View File
@@ -1,8 +1,13 @@
#include <tkDNN/pluginsRT/YoloRT.h>
#include <utility>
#include <mutex>
using namespace nvinfer1;
// used to retrive Yolo plugin during network deserialization
std::mutex gYoloPlugins_mutex;
std::vector<YoloRT*> gYoloPlugins;
std::vector<PluginField> YoloRTPluginCreator::mPluginAttributes;
PluginFieldCollection YoloRTPluginCreator::mFC{};
@@ -22,6 +27,10 @@ YoloRT::YoloRT(int classes, int num, int c,int h,int w,int n_masks, float scale_
this->nms_thresh = nms_thresh;
this->nms_kind = nms_kind;
this->new_coords = new_coords;
bias.clear();
mask.clear();
classesNames.clear();
}
YoloRT::YoloRT(const void *data, size_t length) {
@@ -36,7 +45,24 @@ YoloRT::YoloRT(const void *data, size_t length) {
c = readBUF<int>(buf);
h = readBUF<int>(buf);
w = readBUF<int>(buf);
mask.resize(n_masks);
for(int i=0; i<n_masks; i++)
mask[i] = readBUF<dnnType>(buf);
bias.resize(n_masks*2*num);
for(int i=0; i<n_masks*2*num; i++)
bias[i] = readBUF<dnnType>(buf);
// save classes names
classesNames.resize(classes);
for(int i=0; i<classes; i++) {
char tmp[YOLORT_CLASSNAME_W];
for(int j=0; j<YOLORT_CLASSNAME_W; j++)
tmp[j] = readBUF<char>(buf);
classesNames[i] = std::string(tmp);
}
assert(buf == bufCheck + length);
gYoloPlugins.push_back(this);
}
YoloRT::~YoloRT() {}
@@ -126,7 +152,7 @@ int32_t YoloRT::enqueue(int32_t batchSize, const void *const *inputs, void **out
size_t YoloRT::getSerializationSize() const NOEXCEPT {
return 8 * sizeof(int) + 2 * sizeof(float) ;
return 8 * sizeof(int) + 2 * sizeof(float) + n_masks*sizeof(dnnType) + num*n_masks*2*sizeof(dnnType) + YOLORT_CLASSNAME_W*classes*sizeof(char);
}
bool YoloRT::supportsFormat(DataType type, PluginFormat format) const NOEXCEPT {
@@ -145,6 +171,19 @@ void YoloRT::serialize(void *buffer) const NOEXCEPT {
writeBUF(buf, c); //std::cout << "C : " << c << std::endl;
writeBUF(buf, h); //std::cout << "H : " << h << std::endl;
writeBUF(buf, w); //std::cout << "C : " << c << std::endl;
for (int i = 0; i < n_masks; i++)
writeBUF(buf, mask[i]); //std::cout << "mask[i] : " << mask[i] << std::endl;
for (int i = 0; i < n_masks * 2 * num; i++)
writeBUF(buf, bias[i]); //std::cout << "bias[i] : " << bias[i] << std::endl;
// save classes names
for(int i=0; i<classes; i++) {
char tmp[YOLORT_CLASSNAME_W];
strcpy(tmp, classesNames[i].c_str());
for(int j=0; j<YOLORT_CLASSNAME_W; j++) {
writeBUF(buf, tmp[j]);
}
}
assert(buf == a + getSerializationSize());
}
@@ -171,6 +210,9 @@ void YoloRT::setPluginNamespace(const char *pluginNamespace) NOEXCEPT {
IPluginV2Ext *YoloRT::clone() const NOEXCEPT {
auto *p = new YoloRT(classes, num,c,h,w,n_masks, scaleXY, nms_thresh, nms_kind, new_coords);
p->mask = mask;
p->bias = bias;
p->classesNames = classesNames;
p->setPluginNamespace(mPluginNamespace.c_str());
return p;
}
@@ -235,6 +277,17 @@ IPluginV2Ext *YoloRTPluginCreator::createPlugin(const char *name, const PluginFi
int nms_kind = *(static_cast<const int*>(fields[8].data));
int new_coords = *(static_cast<const int*>(fields[9].data));
auto *pluginObj = new YoloRT(classes,num,c,h,w,n_masks,scaleXY,nmsThresh,nms_kind,new_coords);
// fill additional data
pluginObj->mask.resize(fields[10].length*sizeof(float));
memcpy(pluginObj->mask.data(), fields[10].data, fields[10].length*sizeof(float));
pluginObj->bias.resize(fields[11].length*sizeof(float));
memcpy(pluginObj->bias.data(), fields[11].data, fields[11].length*sizeof(float));
pluginObj->classesNames.resize(classes);
for(int i=0; i<classes; i++) {
pluginObj->classesNames[i].resize(fields[12+i].length);
memcpy(&pluginObj->classesNames[i][0], fields[12+i].data, fields[12+i].length*sizeof(char));
}
return pluginObj;
}