Mirrors/opencv
0
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-01-18 17:21:42 +01:00
Code Packages Releases Activity

Use Mat::total() in Darknet IO

Browse Source
This commit is contained in:
Adrian Kretz
2026-01-10 16:39:44 +01:00
parent d8bc5b94b8
commit 29d68af2a8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/dnn/src/darknet/darknet_io.cpp
View File

@@ -1008,7 +1008,6 @@ namespace cv {
if (layer_type == "convolutional" || layer_type == "connected") if (layer_type == "convolutional" || layer_type == "connected")
{ {
size_t weights_size;
int filters; int filters;
bool use_batch_normalize; bool use_batch_normalize;
cv::Mat weightsBlob; cv::Mat weightsBlob;
@@ -1023,7 +1022,6 @@ namespace cv {
CV_Assert(tensor_shape[0] > 0); CV_Assert(tensor_shape[0] > 0);
CV_Assert(tensor_shape[0] % groups == 0); CV_Assert(tensor_shape[0] % groups == 0);
weights_size = filters * (tensor_shape[0] / groups) * kernel_size * kernel_size;
int sizes_weights[] = { filters, tensor_shape[0] / groups, kernel_size, kernel_size }; int sizes_weights[] = { filters, tensor_shape[0] / groups, kernel_size, kernel_size };
weightsBlob.create(4, sizes_weights, CV_32F); weightsBlob.create(4, sizes_weights, CV_32F);
} }
@@ -1034,7 +1032,6 @@ namespace cv {
CV_Assert(filters>0); CV_Assert(filters>0);
weights_size = total(tensor_shape) * filters;
int sizes_weights[] = { filters, total(tensor_shape) }; int sizes_weights[] = { filters, total(tensor_shape) };
weightsBlob.create(2, sizes_weights, CV_32F); weightsBlob.create(2, sizes_weights, CV_32F);
} }
@@ -1051,7 +1048,7 @@ namespace cv {
ifile.read(reinterpret_cast<char *>(meanData_mat.ptr<float>()), sizeof(float)*filters); ifile.read(reinterpret_cast<char *>(meanData_mat.ptr<float>()), sizeof(float)*filters);
ifile.read(reinterpret_cast<char *>(stdData_mat.ptr<float>()), sizeof(float)*filters); ifile.read(reinterpret_cast<char *>(stdData_mat.ptr<float>()), sizeof(float)*filters);
} }
ifile.read(reinterpret_cast<char *>(weightsBlob.ptr<float>()), sizeof(float)*weights_size); ifile.read(reinterpret_cast<char *>(weightsBlob.ptr<float>()), sizeof(float)*weightsBlob.total());
// set conv/connected weights // set conv/connected weights
std::vector<cv::Mat> layer_blobs; std::vector<cv::Mat> layer_blobs;