thebears/deepstream_yolo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New YOLOv5 conversion and support (>= v2.0)

Browse Source
This commit is contained in:
Marcos Luciano
2022-07-14 11:50:55 -03:00
parent 095696a296
commit 058db92ad1
15 changed files with 763 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
nvdsinfer_custom_impl_Yolo/layers/convolutional_layer.cpp
View File

@@ -44,6 +44,11 @@ nvinfer1::ILayer* convolutionalLayer(
groups = std::stoi(block.at("groups"));
}
if (block.find("bias") != block.end())
{
bias = std::stoi(block.at("bias"));
}
int pad;
if (padding)
pad = (kernelSize - 1) / 2;
@@ -61,14 +66,17 @@ nvinfer1::ILayer* convolutionalLayer(
if (weightsType == "weights") {
if (batchNormalize == false)
{
float* val = new float[filters];
for (int i = 0; i < filters; ++i)
{
val[i] = weights[weightPtr];
weightPtr++;
float* val;
if (bias != 0) {
val = new float[filters];
for (int i = 0; i < filters; ++i)
{
val[i] = weights[weightPtr];
weightPtr++;
}
convBias.values = val;
trtWeights.push_back(convBias);
}
convBias.values = val;
trtWeights.push_back(convBias);
val = new float[size];
for (int i = 0; i < size; ++i)
{
@@ -108,7 +116,8 @@ nvinfer1::ILayer* convolutionalLayer(
}
convWt.values = val;
trtWeights.push_back(convWt);
trtWeights.push_back(convBias);
if (bias != 0)
trtWeights.push_back(convBias);
}
}
else {
@@ -122,14 +131,16 @@ nvinfer1::ILayer* convolutionalLayer(
}
convWt.values = val;
trtWeights.push_back(convWt);
val = new float[filters];
for (int i = 0; i < filters; ++i)
{
val[i] = weights[weightPtr];
weightPtr++;
if (bias != 0) {
val = new float[filters];
for (int i = 0; i < filters; ++i)
{
val[i] = weights[weightPtr];
weightPtr++;
}
convBias.values = val;
trtWeights.push_back(convBias);
}
convBias.values = val;
trtWeights.push_back(convBias);
}
else
{
@@ -161,7 +172,8 @@ nvinfer1::ILayer* convolutionalLayer(
weightPtr++;
}
trtWeights.push_back(convWt);
trtWeights.push_back(convBias);
if (bias != 0)
trtWeights.push_back(convBias);
}
}