From 6ecc07d56a2688e3fa08c8602abd5f076d45a6f5 Mon Sep 17 00:00:00 2001
From: cmhu <2657262686@qq.com>
Date: Fri, 23 Aug 2024 16:36:15 +0800
Subject: [PATCH] 删除aclrtSetDevice

---
 src/ai_engine_module/VPTProcess.cpp                    | 3 ---
 src/ai_engine_module/VPTProcess.cpp_debug              | 2 --
 src/ai_engine_module/face_det_ai_engine.cpp            | 3 ---
 src/ai_engine_module/motocycle_hs_process.cpp          | 1 -
 src/ai_engine_module/motocycle_phone_process.cpp       | 1 -
 src/ai_engine_module/motocycle_refit_phone_process.cpp | 1 -
 src/ai_engine_module/motocycle_refit_process.cpp       | 1 -
 src/ai_engine_module/road_seg_3cls_statistics.cpp      | 1 -
 src/ai_engine_module/road_seg_correlation_algor.cpp    | 1 -
 src/ai_engine_module/road_seg_statistics.cpp           | 1 -
 src/ai_engine_module/road_seg_statistics.cpp.old       | 1 -
 src/ai_engine_module/traffic_light_process.cpp         | 1 -
 src/ai_engine_module/tricycle_manned_process.cpp       | 1 -
 src/ai_engine_module/truck_manned_process.cpp          | 1 -
 14 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/src/ai_engine_module/VPTProcess.cpp b/src/ai_engine_module/VPTProcess.cpp
index 25c83a5..8869304 100755
--- a/src/ai_engine_module/VPTProcess.cpp
+++ b/src/ai_engine_module/VPTProcess.cpp
@@ -41,7 +41,6 @@ int VPTProcess::init(VPTProcess_PARAM vparam){
     param.max_batch = 16;
 
     m_devId = param.devId;
-    ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
     ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
 
     int ret = vpt_init(&m_det_handle, param);
@@ -70,8 +69,6 @@ int VPTProcess::process_gpu(sy_img * batch_img, vector<string>& tasklist,
 	}
 
     do{
-
-        aclrtSetDevice(m_devId);
         int ret = aclrtSetCurrentContext(m_algorthim_ctx);
 
         /* 路数太多时 按照最大batchsize数 拆批次运行 */
diff --git a/src/ai_engine_module/VPTProcess.cpp_debug b/src/ai_engine_module/VPTProcess.cpp_debug
index b4ff5fa..81660da 100755
--- a/src/ai_engine_module/VPTProcess.cpp_debug
+++ b/src/ai_engine_module/VPTProcess.cpp_debug
@@ -38,7 +38,6 @@ int VPTProcess::init(VPTProcess_PARAM vparam){
     param.isTrk = false;
 
     m_devId = param.devId;
-    ACL_CALL(aclrtSetDevice(m_devId), ACL_ERROR_NONE, -1);
     ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_ERROR_NONE, -1);
 
     int ret = vpt_init(&m_det_handle, param);
@@ -81,7 +80,6 @@ int VPTProcess::process_gpu(sy_img * batch_img, vector<DeviceMemory*> vec_vptMem
 
             vpt_result *real_res = vpt_det_result + startbatch;
 
-            aclrtSetDevice(m_devId);
             int ret = aclrtSetCurrentContext(m_algorthim_ctx);
             if(ACL_ERROR_NONE != ret){
                 break;
diff --git a/src/ai_engine_module/face_det_ai_engine.cpp b/src/ai_engine_module/face_det_ai_engine.cpp
index 70542f1..2175f82 100755
--- a/src/ai_engine_module/face_det_ai_engine.cpp
+++ b/src/ai_engine_module/face_det_ai_engine.cpp
@@ -16,7 +16,6 @@ face_det_ai_engine::~face_det_ai_engine(){
 	clear();
 
 	if(m_algorthim_ctx){
-		aclrtSetDevice(m_devId);
         aclrtDestroyContext(m_algorthim_ctx);
     }
 }
@@ -27,7 +26,6 @@ int face_det_ai_engine::init_ai_engine(const facedet_ai_engine_param &ai_param/*
 
 	m_devId = ai_param.sdk_param.devId;
 
-	ACL_CALL(aclrtSetDevice(m_devId), ACL_ERROR_NONE, -1);
     ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_ERROR_NONE, -1);
 
 	return fd_init(&handle, ai_param.sdk_param);
@@ -42,7 +40,6 @@ int face_det_ai_engine::ai_engine_process_batch(std::vector<std::string> &task_i
 		return 0;
 	}
 
-	aclrtSetDevice(m_devId);
 	int ret = aclrtSetCurrentContext(m_algorthim_ctx);
 	if(ACL_ERROR_NONE != ret){
 		return 0;
diff --git a/src/ai_engine_module/motocycle_hs_process.cpp b/src/ai_engine_module/motocycle_hs_process.cpp
index c125367..377ae4d 100644
--- a/src/ai_engine_module/motocycle_hs_process.cpp
+++ b/src/ai_engine_module/motocycle_hs_process.cpp
@@ -99,7 +99,6 @@ namespace ai_engine_module
             param.max_batch = 8;
           
             m_devId = param.devId;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
             
             int status;
diff --git a/src/ai_engine_module/motocycle_phone_process.cpp b/src/ai_engine_module/motocycle_phone_process.cpp
index 5955511..4430f84 100644
--- a/src/ai_engine_module/motocycle_phone_process.cpp
+++ b/src/ai_engine_module/motocycle_phone_process.cpp
@@ -102,7 +102,6 @@ namespace ai_engine_module
             param.max_batch = 8;
           
             m_devId = param.devId;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
             
             int status;
diff --git a/src/ai_engine_module/motocycle_refit_phone_process.cpp b/src/ai_engine_module/motocycle_refit_phone_process.cpp
index 58c7b1b..0e6855a 100644
--- a/src/ai_engine_module/motocycle_refit_phone_process.cpp
+++ b/src/ai_engine_module/motocycle_refit_phone_process.cpp
@@ -117,7 +117,6 @@ namespace ai_engine_module
             hcp_param.max_batch = 8;
           
             m_devId = gpu_id;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
 
             int status;
diff --git a/src/ai_engine_module/motocycle_refit_process.cpp b/src/ai_engine_module/motocycle_refit_process.cpp
index d1fa7a2..cd3f8cf 100644
--- a/src/ai_engine_module/motocycle_refit_process.cpp
+++ b/src/ai_engine_module/motocycle_refit_process.cpp
@@ -103,7 +103,6 @@ namespace ai_engine_module
             param.max_batch = 8;
           
             m_devId = param.devId;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
             
             int status;
diff --git a/src/ai_engine_module/road_seg_3cls_statistics.cpp b/src/ai_engine_module/road_seg_3cls_statistics.cpp
index 68017f4..d16b598 100644
--- a/src/ai_engine_module/road_seg_3cls_statistics.cpp
+++ b/src/ai_engine_module/road_seg_3cls_statistics.cpp
@@ -213,7 +213,6 @@ int Road3clsSegProcess::init(int gpu_id, string models_dir) {
     param.devId = gpu_id;
 
     m_devId = param.devId;
-    ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
     ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
 
     int ret = rs3cls_init(&m_seg_handle, param); 
diff --git a/src/ai_engine_module/road_seg_correlation_algor.cpp b/src/ai_engine_module/road_seg_correlation_algor.cpp
index f2ba2f9..040496b 100644
--- a/src/ai_engine_module/road_seg_correlation_algor.cpp
+++ b/src/ai_engine_module/road_seg_correlation_algor.cpp
@@ -545,7 +545,6 @@ namespace ai_engine_module
             param.devId = gpu_id;*/
           
             m_devId = gpu_id;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
             
             /*int status;
diff --git a/src/ai_engine_module/road_seg_statistics.cpp b/src/ai_engine_module/road_seg_statistics.cpp
index 2080e3b..24b6827 100644
--- a/src/ai_engine_module/road_seg_statistics.cpp
+++ b/src/ai_engine_module/road_seg_statistics.cpp
@@ -239,7 +239,6 @@ int RoadSegProcess::init(int gpu_id, string models_dir) {
     param.devId = gpu_id;
 
     m_devId = param.devId;
-    ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
     ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
 
     int ret = rs_init(&m_seg_handle, param); 
diff --git a/src/ai_engine_module/road_seg_statistics.cpp.old b/src/ai_engine_module/road_seg_statistics.cpp.old
index 4ca01f3..4214821 100644
--- a/src/ai_engine_module/road_seg_statistics.cpp.old
+++ b/src/ai_engine_module/road_seg_statistics.cpp.old
@@ -241,7 +241,6 @@ int RoadSegProcess::init(int gpu_id, string models_dir) {
     param.devId = gpu_id;
 
     m_devId = param.devId;
-    ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
     ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
 
     int ret = rs_init(&m_seg_handle, param); 
diff --git a/src/ai_engine_module/traffic_light_process.cpp b/src/ai_engine_module/traffic_light_process.cpp
index 303d50d..e4bb119 100644
--- a/src/ai_engine_module/traffic_light_process.cpp
+++ b/src/ai_engine_module/traffic_light_process.cpp
@@ -281,7 +281,6 @@ namespace ai_engine_module
             param.max_batch = 8;
           
             m_devId = param.devId;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
             
             int status;
diff --git a/src/ai_engine_module/tricycle_manned_process.cpp b/src/ai_engine_module/tricycle_manned_process.cpp
index a75f3cc..24578c6 100644
--- a/src/ai_engine_module/tricycle_manned_process.cpp
+++ b/src/ai_engine_module/tricycle_manned_process.cpp
@@ -47,7 +47,6 @@ namespace ai_engine_module
             param.max_batch = 8;
           
             m_devId = param.devId;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
             
             int status;
diff --git a/src/ai_engine_module/truck_manned_process.cpp b/src/ai_engine_module/truck_manned_process.cpp
index 2eb6bc7..8acc3ad 100644
--- a/src/ai_engine_module/truck_manned_process.cpp
+++ b/src/ai_engine_module/truck_manned_process.cpp
@@ -131,7 +131,6 @@ namespace ai_engine_module
             vparam.devId = gpu_id;
           
             m_devId = gpu_id;
-            ACL_CALL(aclrtSetDevice(m_devId), ACL_SUCCESS, -1);
             ACL_CALL(aclrtCreateContext(&m_algorthim_ctx, m_devId), ACL_SUCCESS, -1);
 
             int status;
--
libgit2 0.21.4