添加clothes算法

Hu Chunming
1 parent f3d83919
Showing 6 changed files with 106 additions and 14 deletions
src/PicAnalysis.cpp
src/PicAnalysis.h
src/ai_engine_module/VehicleAnalysis.cpp
src/ai_engine_module/VehicleAnalysis.h
src/ai_engine_module/VidClothes.cpp
src/ai_engine_module/VidClothes.h
@@ -27,9 +27,13 @@ int PicAnalysis::init(int dev_id) {
         return -1;
     }
-	ACL_CALL(aclrtCreateContext(&m_ctx, 0), ACL_ERROR_NONE, SY_FAILED);
-	ACL_CALL(aclrtSetCurrentContext(m_ctx), ACL_ERROR_NONE, SY_FAILED);
+    ret = m_clothes_algorithm.init(dev_id);
+    if(0 != ret){
+        return -1;
+    }
+    ACL_CALL(aclrtCreateContext(&m_ctx, 0), ACL_ERROR_NONE, SY_FAILED);
+	ACL_CALL(aclrtSetCurrentContext(m_ctx), ACL_ERROR_NONE, SY_FAILED);
 	ACL_CALL(aclrtCreateStream(&stream), ACL_SUCCESS, SY_FAILED);
     m_dvpp = new DvppProcess();
 	m_dvpp->InitResource(stream);
@@ -39,6 +43,8 @@ int PicAnalysis::init(int dev_id) {
 int PicAnalysis::analysis_sync(vector<string> vec_file_path){
+    ACL_CALL(aclrtSetCurrentContext(m_ctx), ACL_ERROR_NONE, SY_FAILED);
+
     const int batch_size = vec_file_path.size();
     vector<sy_img> vec_img;
@@ -71,7 +77,7 @@ int PicAnalysis::analysis_sync(vector&lt;string&gt; vec_file_path){
         vec_img.push_back(img);
     }
-    // m_vehicle_analysis.detect(vec_img);
+    m_vehicle_analysis.detect(vec_img);
     vector<HeadTailResult> head_tail_result;
     ret = m_head_tail_algorithm.detect(vec_img, head_tail_result);
@@ -79,6 +85,8 @@ int PicAnalysis::analysis_sync(vector&lt;string&gt; vec_file_path){
         LOG_ERROR("m_head_tail_algorithm failed!");
         head_tail_result.clear();
     }
+
+    m_clothes_algorithm.detect(vec_img);
     return 0;
 #include "./ai_engine_module/include.h"
 #include "./ai_engine_module/VehicleAnalysis.h"
 #include "./ai_engine_module/VehicleHeadTail.h"
+#include "./ai_engine_module/VidClothes.h"
 using namespace std;
@@ -25,6 +26,7 @@ private:
     VehicleAnalysis m_vehicle_analysis;
     VehicleHeadTail m_head_tail_algorithm;
+    VidClothes m_clothes_algorithm;
 };
@@ -57,13 +57,12 @@ int VehicleAnalysis::init(int devId, int max_batch_size) {
 	param.models_Path="./models/vehicle_analysis/";	//所有模型的地址
     cout << "va_init start " << endl;
+    // 内部有 ctx
     int ret = va_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
-	ACL_CALL(aclrtCreateContext(&ctx, devId), ACL_ERROR_NONE, SY_FAILED);
-
     cout << "va_init success " << endl;
     return 0;
 }
@@ -83,7 +82,6 @@ int VehicleAnalysis::detect(vector&lt;sy_img&gt; vec_img) {
         }			
     }
-    ACL_CALL(aclrtSetCurrentContext(ctx), ACL_ERROR_NONE, SY_FAILED);	
     int ret = va_batch(m_handle, vec_img.data(), batch_size, result);
     for (int b = 0; b < batch_size; b++)
@@ -615,13 +613,7 @@ int VehicleAnalysis::detect(vector&lt;sy_img&gt; vec_img) {
 }
 void VehicleAnalysis::release(){
-    if(ctx){
-        aclrtSetCurrentContext(ctx);
-        aclrtDestroyContext(ctx);
-    }
-
     if (m_handle) {
         va_release(&m_handle);
     }
-    
 }
@@ -27,8 +27,6 @@ private:
     float m_threshold;
 	int m_max_batchsize{1};
-
-    aclrtContext ctx{nullptr};
 };
+#include "VidClothes.h"
+
+VidClothes::VidClothes(/* args */)
+{
+}
+
+VidClothes::~VidClothes()
+{
+    release();
+}
+
+int VidClothes::init(int devId){
+    ACL_CALL(aclrtCreateContext(&ctx, devId), SY_SUCCESS, SY_FAILED);
+
+    vidclothes_param param;
+    param.modelNames = "./models/vid_clothes/vidClothes0325_310P.om";
+    param.thresld = 0.0;
+    param.devId = 0;
+
+     cout << "vidclothes_init start " << endl;
+    int ret = vidclothes_init(&m_handle, param);
+    if (ret != 0) {
+        return -1;
+	}
+
+    cout << "vidclothes_init success " << endl;
+
+    return SY_SUCCESS;
+}
+
+int VidClothes::detect(vector<sy_img> vec_img){
+
+    ACL_CALL(aclrtSetCurrentContext(ctx), SY_SUCCESS, SY_FAILED);	
+
+    const int batchsize = vec_img.size();
+    vidclothes_result * results = new vidclothes_result[batchsize];
+
+    int ret = SY_FAILED;
+
+    do
+    {
+        ret = vidclothes_batch(m_handle, vec_img.data(), batchsize, results);
+        if (SY_SUCCESS != ret) {
+            printf("vidclothesClassification process failed!");
+            break;
+        }
+        
+        for(int batchIdx = 0;batchIdx<batchsize;batchIdx++) {    
+            printf("index:%d,confidence:%f\n",results[batchIdx].index,results[batchIdx].score);
+        }
+    } while (0);
+
+    if (results) {
+        delete [] results;
+    }
+
+    return ret;
+}
+
+void VidClothes::release() {
+    if(ctx){
+        aclrtSetCurrentContext(ctx);
+        aclrtDestroyContext(ctx);
+    }
+
+    if (m_handle) {
+        vidclothes_release(&m_handle);
+    }
+}
 \ No newline at end of file
+#include "include.h"
+#include "vid_clothes.h"
+
+class VidClothes
+{
+private:
+    /* data */
+public:
+    VidClothes(/* args */);
+    ~VidClothes();
+
+    int init(int devId);
+
+    int detect(vector<sy_img> vec_img);
+
+private:
+    void release();
+
+private:
+    void* m_handle{nullptr};
+    aclrtContext ctx{nullptr};
+};
+