Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix strides #1492

Merged
merged 11 commits into from
Apr 23, 2024
Merged

fix strides #1492

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37ddb30
yolov8 p2
lindsayshuo Apr 17, 2024
df11eab
yolov8 p2
lindsayshuo Apr 17, 2024
ee640a8
yolov8 p2
lindsayshuo Apr 17, 2024
cea1195
yolov8 p2
lindsayshuo Apr 17, 2024
20ae8f4
Update yolov8_det.cpp
lindsayshuo Apr 17, 2024
6ce06d5
Update model.cpp
lindsayshuo Apr 17, 2024
246cb75
Update model.cpp
lindsayshuo Apr 17, 2024
ebba1f9
Update model.cpp
lindsayshuo Apr 17, 2024
a149c50
Update model.cpp
lindsayshuo Apr 17, 2024
c210916
Merge pull request #1 from wang-xinyu/master
lindsayshuo Apr 22, 2024
917210a
fix strides
lindsayshuo Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions yolov8/src/model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ static int get_depth(int x, float gd) {
return std::max<int>(r, 1);
}

void calculateStrides(nvinfer1::IElementWiseLayer* conv_layers[], int size, int reference_size, int strides[]) {
for (int i = 0; i < size; ++i) {
nvinfer1::ILayer* layer = conv_layers[i];
nvinfer1::Dims dims = layer->getOutput(0)->getDimensions();
int feature_map_size = dims.d[1];
strides[i] = reference_size / feature_map_size;
}
}

static nvinfer1::IElementWiseLayer* Proto(nvinfer1::INetworkDefinition* network,
std::map<std::string, nvinfer1::Weights>& weightMap, nvinfer1::ITensor& input,
std::string lname, float gw, int max_channels) {
Expand Down Expand Up @@ -220,7 +229,9 @@ nvinfer1::IHostMemory* buildEngineYolov8Det(nvinfer1::IBuilder* builder, nvinfer
********************************************* YOLOV8 DETECT ******************************************
*******************************************************************************************************/

int strides[] = {8, 16, 32};
nvinfer1::IElementWiseLayer* conv_layers[] = {conv3, conv5, conv7};
int strides[sizeof(conv_layers) / sizeof(conv_layers[0])];
calculateStrides(conv_layers, sizeof(conv_layers) / sizeof(conv_layers[0]), kInputH, strides);
int stridesLength = sizeof(strides) / sizeof(int);

nvinfer1::IShuffleLayer* shuffle22_0 = network->addShuffle(*cat22_0->getOutput(0));
Expand Down Expand Up @@ -507,7 +518,9 @@ nvinfer1::IHostMemory* buildEngineYolov8DetP6(nvinfer1::IBuilder* builder, nvinf
/*******************************************************************************************************
********************************************* YOLOV8 DETECT ******************************************
*******************************************************************************************************/
int strides[] = {8, 16, 32, 64};
nvinfer1::IElementWiseLayer* conv_layers[] = {conv3, conv5, conv7, conv9};
int strides[sizeof(conv_layers) / sizeof(conv_layers[0])];
calculateStrides(conv_layers, sizeof(conv_layers) / sizeof(conv_layers[0]), kInputH, strides);
int stridesLength = sizeof(strides) / sizeof(int);

// P3 processing steps (remains unchanged)
Expand Down Expand Up @@ -817,7 +830,9 @@ nvinfer1::IHostMemory* buildEngineYolov8DetP2(nvinfer1::IBuilder* builder, nvinf
********************************************* YOLOV8 DETECT ******************************************
*******************************************************************************************************/

int strides[] = {4, 8, 16, 32};
nvinfer1::IElementWiseLayer* conv_layers[] = {conv1, conv3, conv5, conv7};
int strides[sizeof(conv_layers) / sizeof(conv_layers[0])];
calculateStrides(conv_layers, sizeof(conv_layers) / sizeof(conv_layers[0]), kInputH, strides);
int stridesLength = sizeof(strides) / sizeof(int);

// P2 processing steps (remains unchanged)
Expand Down Expand Up @@ -1148,7 +1163,9 @@ nvinfer1::IHostMemory* buildEngineYolov8Seg(nvinfer1::IBuilder* builder, nvinfer
********************************************* YOLOV8 DETECT ******************************************
*******************************************************************************************************/

int strides[] = {8, 16, 32};
nvinfer1::IElementWiseLayer* conv_layers[] = {conv3, conv5, conv7};
int strides[sizeof(conv_layers) / sizeof(conv_layers[0])];
calculateStrides(conv_layers, sizeof(conv_layers) / sizeof(conv_layers[0]), kInputH, strides);
int stridesLength = sizeof(strides) / sizeof(int);

nvinfer1::IShuffleLayer* shuffle22_0 = network->addShuffle(*cat22_0->getOutput(0));
Expand Down
Loading