优化代码

main
熊继淙 1 year ago
parent 243dfa5a72
commit d941974285

@ -28,9 +28,9 @@ void test01()
matImgs.emplace_back(cv::imread(_var, 1)); matImgs.emplace_back(cv::imread(_var, 1));
} }
utils::InitParameter params; trtUtils::InitParameter params;
params.m_modelType = utils::ME_ModelType::E_RESNET34; params.m_modelType = trtUtils::ME_ModelType::E_RESNET34;
params.class_names = utils::dataSets::flower_labels; params.class_names = trtUtils::dataSets::flower_labels;
//initParameters.class_names = utils::dataSets::voc20; //initParameters.class_names = utils::dataSets::voc20;
params.num_class = 5; // for flower_labels params.num_class = 5; // for flower_labels
//initParameters.num_class = 20; // for voc2012 //initParameters.num_class = 20; // for voc2012
@ -53,9 +53,9 @@ void test01()
return; return;
} }
utils::InitParameter params1; trtUtils::InitParameter params1;
params1.m_modelType = utils::ME_ModelType::E_RESNET50; params1.m_modelType = trtUtils::ME_ModelType::E_RESNET50;
params1.class_names = utils::dataSets::flower_labels; params1.class_names = trtUtils::dataSets::flower_labels;
//initParameters.class_names = utils::dataSets::voc20; //initParameters.class_names = utils::dataSets::voc20;
params1.num_class = 5; // for flower_labels params1.num_class = 5; // for flower_labels
//initParameters.num_class = 20; // for voc2012 //initParameters.num_class = 20; // for voc2012
@ -135,7 +135,7 @@ void test01()
return false; return false;
} }
std::vector<utils::MR_Result> detectResVec1; std::vector<trtUtils::MR_Result> detectResVec1;
bRet = resnet34Ptr->doTRTInfer(matImgs, &detectResVec1, nullptr); bRet = resnet34Ptr->doTRTInfer(matImgs, &detectResVec1, nullptr);
if (!bRet) if (!bRet)
{ {
@ -148,7 +148,7 @@ void test01()
return false; return false;
} }
std::vector<utils::MR_Result> detectResVec2; std::vector<trtUtils::MR_Result> detectResVec2;
bRet = resnet50Ptr->doTRTInfer(matImgs, &detectResVec2, nullptr); bRet = resnet50Ptr->doTRTInfer(matImgs, &detectResVec2, nullptr);
if (!bRet) if (!bRet)
{ {
@ -170,7 +170,7 @@ void test01()
return false; return false;
} }
std::vector<utils::MR_Result> detectResVec1; std::vector<trtUtils::MR_Result> detectResVec1;
bRet = resnet34Ptr->doTRTInfer(matImgs, &detectResVec1, nullptr); bRet = resnet34Ptr->doTRTInfer(matImgs, &detectResVec1, nullptr);
if (!bRet) if (!bRet)
{ {
@ -183,7 +183,7 @@ void test01()
return false; return false;
} }
std::vector<utils::MR_Result> detectResVec2; std::vector<trtUtils::MR_Result> detectResVec2;
bRet = resnet50Ptr->doTRTInfer(matImgs, &detectResVec2, nullptr); bRet = resnet50Ptr->doTRTInfer(matImgs, &detectResVec2, nullptr);
if (!bRet) if (!bRet)
{ {

Loading…
Cancel
Save