From 4a7085123d487f49d85f34b5cf7967ef6a5d9093 Mon Sep 17 00:00:00 2001
From: "Oliver.H.Chow" <3493511173@qq.com>
Date: Thu, 27 Oct 2022 18:44:23 +0000
Subject: [PATCH 1/2] update
 PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/test/env_npu.sh.

Signed-off-by: Oliver.H.Chow <3493511173@qq.com>
---
 .../test/env_npu.sh                           | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/test/env_npu.sh b/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/test/env_npu.sh
index c3c1ea294f..e2ce4cfad2 100644
--- a/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/test/env_npu.sh
+++ b/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/test/env_npu.sh
@@ -1,27 +1,13 @@
 #!/bin/bash
-# 配置CANN相关环境变量
-CANN_INSTALL_PATH_CONF='/etc/Ascend/ascend_cann_install.info'
-
-if [ -f $CANN_INSTALL_PATH_CONF ]; then
-  CANN_INSTALL_PATH=$(cat $CANN_INSTALL_PATH_CONF | grep Install_Path | cut -d "=" -f 2)
-else
-  CANN_INSTALL_PATH="/usr/local/Ascend/"
-fi
-
-if [ -d ${CANN_INSTALL_PATH}/ascend-toolkit/latest ];then
-  source ${CANN_INSTALL_PATH}/ascend-toolkit/set_env.sh
-else
-  source ${CANN_INSTALL_PATH}/nnae/set_env.sh
-fi
-
-msnpureport -g error -d 0
-msnpureport -g error -d 1
-msnpureport -g error -d 2
-msnpureport -g error -d 3
-msnpureport -g error -d 4
-msnpureport -g error -d 5
-msnpureport -g error -d 6
-msnpureport -g error -d 7
+export install_path=/usr/local/Ascend
+
+export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/latest/lib64:/usr/local/Ascend/ascend-toolkit/latest/lib64/plugin/opskernel:/usr/local/Ascend/ascend-toolkit/latest/lib64/plugin/nnengine:$LD_LIBRARY_PATH
+export PYTHONPATH=/usr/local/Ascend/ascend-toolkit/latest/python/site-packages:/usr/local/Ascend/ascend-toolkit/latest/opp/op_impl/built-in/ai_core/tbe:$PYTHONPATH
+export PATH=/usr/local/Ascend/ascend-toolkit/latest/bin:/usr/local/Ascend/ascend-toolkit/latest/compiler/ccec_compiler/bin:$PATH
+export ASCEND_AICPU_PATH=/usr/local/Ascend/ascend-toolkit/latest
+export ASCEND_OPP_PATH=/usr/local/Ascend/ascend-toolkit/latest/opp
+export TOOLCHAIN_HOME=/usr/local/Ascend/ascend-toolkit/latest/toolkit
+export ASCEND_HOME_PATH=/usr/local/Ascend/ascend-toolkit/latest
 
 #将Host日志输出到串口,0-关闭/1-开启
 export ASCEND_SLOG_PRINT_TO_STDOUT=0
@@ -34,12 +20,20 @@ export TASK_QUEUE_ENABLE=1
 #设置是否开启PTCopy,0-关闭/1-开启
 export PTCOPY_ENABLE=1
 #设置是否开启combined标志,0-关闭/1-开启
-export COMBINED_ENABLE=1
-#设置特殊场景是否需要重新编译,不需要修改
-export DYNAMIC_OP="ADD#MUL"
 #HCCL白名单开关,1-关闭/0-开启
 export HCCL_WHITELIST_DISABLE=1
 
+#设置device侧日志登记为error
+${install_path}/driver/tools/msnpureport -g error -d 0
+${install_path}/driver/tools/msnpureport -g error -d 1
+${install_path}/driver/tools/msnpureport -g error -d 2
+${install_path}/driver/tools/msnpureport -g error -d 3
+${install_path}/driver/tools/msnpureport -g error -d 4
+${install_path}/driver/tools/msnpureport -g error -d 5
+${install_path}/driver/tools/msnpureport -g error -d 6
+${install_path}/driver/tools/msnpureport -g error -d 7
+#关闭Device侧Event日志
+${install_path}/driver/tools/msnpureport -e disable
 
 path_lib=$(python3.7 -c """
 import sys
-- 
Gitee


From af207ab180af39b70468e34997120a4140a46632 Mon Sep 17 00:00:00 2001
From: "Oliver.H.Chow" <3493511173@qq.com>
Date: Tue, 8 Nov 2022 09:25:22 +0000
Subject: [PATCH 2/2] update
 PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/requirements.txt.

Signed-off-by: Oliver.H.Chow <3493511173@qq.com>
---
 .../InceptionV4_ID1778_for_PyTorch/requirements.txt         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/requirements.txt b/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/requirements.txt
index 9ec5e11346..eb42c5baa2 100644
--- a/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/requirements.txt
+++ b/PyTorch/contrib/cv/classification/InceptionV4_ID1778_for_PyTorch/requirements.txt
@@ -1,5 +1,7 @@
-torchvision
+torchvision==0.9.1
 munch
 tqdm
 scipy
-pillow==9.1.0
\ No newline at end of file
+pillow==9.1.0
+sympy
+decorator
\ No newline at end of file
-- 
Gitee