Hu Chunming / vpt_ascend_arm

Commit dd72b40447d666bf41ed8b517a27a00ea9bb9895

Authored by Zhao Shuaihua
1 parent 0bb99bec

拉取dev-cmhu分支代码

Inline Side-by-side
Showing 3 changed files with 15 additions and 15 deletions
src/Makefile
  View file @dd72b40
1 1 XX = g++
2 2  
3 3  
4   -PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm
  4 +PROJECT_ROOT= /data/shzhao/vpt_ascend
5 5  
6 6 DEPEND_DIR = $(PROJECT_ROOT)/bin
7 7 SRC_ROOT = $(PROJECT_ROOT)/src
... ...
src/demo/Makefile
  View file @dd72b40
1 1 XX = g++
2 2  
3 3  
4   -PROJECT_ROOT= /opt/cmhu/vpt_ascend_arm
  4 +PROJECT_ROOT= /data/shzhao/vpt_ascend
5 5  
6 6 DEPEND_DIR = $(PROJECT_ROOT)/bin
7 7 SRC_ROOT = $(PROJECT_ROOT)/src
... ... @@ -57,4 +57,4 @@ $(TARGET):$(OBJS)
57 57 $(XX) $(CXXFLAGS) -c $<
58 58  
59 59 clean:
60   - rm -f *.o $(TARGET)
61 60 \ No newline at end of file
  61 + rm -f *.o $(TARGET)
... ...
src/demo/demo.cpp
  View file @dd72b40
... ... @@ -12,11 +12,11 @@ using namespace std;
12 12 void init_mq_conn(void *handle) {
13 13 for (auto key : {mq_type_t::ALARM_MQ, mq_type_t::GET_TASK_MQ, mq_type_t::HEART_BEAT_MQ, mq_type_t::SCREENSHORT_TASK_MQ, mq_type_t::TIMING_SCREENSHORT_TASK_MQ}) {
14 14 rabbitmq_conn_params_t mq_conn_params;
15   - mq_conn_params.port = 5673;
  15 + mq_conn_params.port = 5672;
16 16  
17   - strcpy(mq_conn_params.ip, "192.168.10.8");
18   - strcpy(mq_conn_params.uname, "guest");
19   - strcpy(mq_conn_params.passwd, "guest");
  17 + strcpy(mq_conn_params.ip, "192.168.60.126");
  18 + strcpy(mq_conn_params.uname, "admin");
  19 + strcpy(mq_conn_params.passwd, "123456");
20 20 strcpy(mq_conn_params.vhost, "/");
21 21 strcpy(mq_conn_params.exchange, "topExchange");
22 22 strcpy(mq_conn_params.exchange_type, "topic");
... ... @@ -658,10 +658,10 @@ string createTask(void *handle, std::vector&lt;algorithm_type_t&gt; algor_vec, int gi,
658 658 tparam.ipc_url = "/opt/share/data/Street.uvf";
659 659 break;
660 660 case 5:
661   - tparam.ipc_url = "/opt/share/data/公安局老桥头_CVR15F89410_1465819864_1B.mp4";
  661 + tparam.ipc_url = "/data/share/data/公安局老桥头_CVR15F89410_1465819864_1B.mp4";
662 662 break;
663 663 case 6:
664   - tparam.ipc_url = "/opt/share/data/不带头盔2.mp4";
  664 + tparam.ipc_url = "/data/share/data/不带头盔2.mp4";
665 665 break;
666 666 case 7:
667 667 tparam.ipc_url = "/opt/share/data/caishenkezhan.mp4";
... ... @@ -808,13 +808,13 @@ void test_gpu(int gpuID){
808 808 // createTask(handle, algor_vec, 20, false);
809 809 // createTask(handle, algor_vec, 20, false);
810 810 // createTask(handle, algor_vec, 20, false);
811   - createTask(handle, algor_vec, 0);
812   - createTask(handle, algor_vec, 1);
813   - createTask(handle, algor_vec, 2);
814   - createTask(handle, algor_vec, 3);
  811 + // createTask(handle, algor_vec, 0);
  812 + // createTask(handle, algor_vec, 1);
  813 + // createTask(handle, algor_vec, 2);
  814 + // createTask(handle, algor_vec, 3);
815 815 // createTask(handle, algor_vec, 4);
816   - // createTask(handle, algor_vec, 5);
817   - // createTask(handle, algor_vec, 6);
  816 + createTask(handle, algor_vec2, 5);
  817 + createTask(handle, algor_vec2, 6);
818 818 // createTask(handle, algor_vec, 7);
819 819 // createTask(handle, algor_vec, 8);
820 820 // createTask(handle, algor_vec, 9);
... ...