优化代码

Code/TestTRTInterDll/TestTRTInterDll.cpp

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