From ae9d38c439e8b80352bc52f923a2706152f7b45f Mon Sep 17 00:00:00 2001
From: Li-chenyangV <18851659065@163.com>
Date: Fri, 24 Jun 2022 22:27:31 +0800
Subject: [PATCH] pytorch1.5 -> 1.8

---
 PyTorch/contrib/cv/video/SlowFast/README.md                 | 6 +++---
 .../config/slowfast_r50_8x8x1_256e_kinetics400_rgb.py       | 2 +-
 PyTorch/contrib/cv/video/SlowFast/requirements.txt          | 4 ++--
 PyTorch/contrib/cv/video/SlowFast/test.py                   | 2 ++
 PyTorch/contrib/cv/video/SlowFast/test/train_full_8p.sh     | 2 +-
 .../contrib/cv/video/SlowFast/test/train_performance_1p.sh  | 2 +-
 PyTorch/contrib/cv/video/SlowFast/train.py                  | 2 ++
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/PyTorch/contrib/cv/video/SlowFast/README.md b/PyTorch/contrib/cv/video/SlowFast/README.md
index 0029cd0acd..1efe488b87 100644
--- a/PyTorch/contrib/cv/video/SlowFast/README.md
+++ b/PyTorch/contrib/cv/video/SlowFast/README.md
@@ -68,12 +68,12 @@ Log Path:
 - slowfast_eval_8p.log       # 8p 测试模型验证集精度日志
 - slowfast_finetune_1p.log   # 1p 下 fine-tuning 日志
 
-## TSM-NonLocal 训练结果
+## SlowFast 训练结果
 
 | top1 acc (单view) |   FPS   |  Epochs | AMP_Type |  Device  |
 |  :---:   | :-----: |  :---:  | :------: | :------: |
-|    -     |  11  |    1    |    O1    |  1p Npu  |
-|  33.43 (30 epochs)   | 81  |    256   |    O1    |  8p Npu  |
+|    -     |  18  |    1    |    O1    |  1p Npu  |
+|  31.43 (30 epochs)   | 95  |    256   |    O1    |  8p Npu  |
 |    -     |  14  |    1    |    O1    |  1p Gpu  |
 |  30.24 (30 epochs)   | 86  |    256   |    O1    |  8p Gpu  |
 
diff --git a/PyTorch/contrib/cv/video/SlowFast/config/slowfast_r50_8x8x1_256e_kinetics400_rgb.py b/PyTorch/contrib/cv/video/SlowFast/config/slowfast_r50_8x8x1_256e_kinetics400_rgb.py
index 7aeb7b41a0..8090ca9cc9 100644
--- a/PyTorch/contrib/cv/video/SlowFast/config/slowfast_r50_8x8x1_256e_kinetics400_rgb.py
+++ b/PyTorch/contrib/cv/video/SlowFast/config/slowfast_r50_8x8x1_256e_kinetics400_rgb.py
@@ -113,6 +113,6 @@ work_dir = './work_dirs/slowfast_r50_3d_8x8x1_256e_kinetics400_rgb'
 DEVICE_ID = 0
 AMP = True
 OPT_LEVEL = "O1"
-LOSS_SCALE = 128.0
+LOSS_SCALE = "dynamic"
 
 dist_params = dict(backend='hccl')
diff --git a/PyTorch/contrib/cv/video/SlowFast/requirements.txt b/PyTorch/contrib/cv/video/SlowFast/requirements.txt
index 3378c79f4c..c9c97915cf 100644
--- a/PyTorch/contrib/cv/video/SlowFast/requirements.txt
+++ b/PyTorch/contrib/cv/video/SlowFast/requirements.txt
@@ -1,5 +1,5 @@
-torch==1.5.0
-torchvision==0.6.0
+torch==1.8.1
+torchvision==0.9.1
 addict==2.4.0
 decorator==5.1.0
 decord==0.6.0
diff --git a/PyTorch/contrib/cv/video/SlowFast/test.py b/PyTorch/contrib/cv/video/SlowFast/test.py
index 2d859e1e19..735f508b57 100644
--- a/PyTorch/contrib/cv/video/SlowFast/test.py
+++ b/PyTorch/contrib/cv/video/SlowFast/test.py
@@ -19,6 +19,8 @@ import warnings
 
 import mmcv
 import torch
+if torch.__version__>= '1.8.1':
+      import torch_npu
 import numpy as np
 from apex import amp
 from mmcv import Config, DictAction
diff --git a/PyTorch/contrib/cv/video/SlowFast/test/train_full_8p.sh b/PyTorch/contrib/cv/video/SlowFast/test/train_full_8p.sh
index 393551ed16..da430bba02 100644
--- a/PyTorch/contrib/cv/video/SlowFast/test/train_full_8p.sh
+++ b/PyTorch/contrib/cv/video/SlowFast/test/train_full_8p.sh
@@ -64,7 +64,7 @@ currentDir=$(cd "$(dirname "$0")";pwd)
 
 source ${currentDir}/env_npu.sh
 
-taskset -c 0-47 python3.7.5 -m torch.distributed.launch --nproc_per_node=$gpus --master_port=$port \
+nohup taskset -c 0-47 python -m torch.distributed.launch --nproc_per_node=$gpus --master_port=$port \
     ${currentDir}/../train.py  --validate --launcher pytorch --cfg-options data.videos_per_gpu=${batch_size} \
     --gpu-ids 0 --data_root ${data_path} --work-dir ./result > ${test_path_dir}/output/${ASCEND_DEVICE_ID}/slowfast_train_full_8p_${ASCEND_DEVICE_ID}.log 2>&1 &
 
diff --git a/PyTorch/contrib/cv/video/SlowFast/test/train_performance_1p.sh b/PyTorch/contrib/cv/video/SlowFast/test/train_performance_1p.sh
index 6c959cf626..a46c1af1d3 100644
--- a/PyTorch/contrib/cv/video/SlowFast/test/train_performance_1p.sh
+++ b/PyTorch/contrib/cv/video/SlowFast/test/train_performance_1p.sh
@@ -69,7 +69,7 @@ currentDir=$(cd "$(dirname -- "$0")";pwd)
 
 source ${currentDir}/env_npu.sh
 
-python3.7.5 -u ${currentDir}/../train.py --data_root ${data_path} --cfg-options optimizer.lr=0.05 total_epochs=1 data.videos_per_gpu=${batch_size} \
+python -u ${currentDir}/../train.py --data_root ${data_path} --cfg-options optimizer.lr=0.05 total_epochs=1 data.videos_per_gpu=${batch_size} \
 --resume-from . > ${test_path_dir}/output/${ASCEND_DEVICE_ID}/slowfast_train_per_1p_${ASCEND_DEVICE_ID}.log 2>&1 &
 
 
diff --git a/PyTorch/contrib/cv/video/SlowFast/train.py b/PyTorch/contrib/cv/video/SlowFast/train.py
index d70921410f..64e6526f65 100644
--- a/PyTorch/contrib/cv/video/SlowFast/train.py
+++ b/PyTorch/contrib/cv/video/SlowFast/train.py
@@ -26,6 +26,8 @@ import torch.distributed as dist
 
 import mmcv
 import torch
+if torch.__version__>= '1.8.1':
+      import torch_npu
 from mmcv import Config, DictAction
 from mmcv.runner import get_dist_info, init_dist, set_random_seed
 from mmcv.utils import get_git_hash
-- 
Gitee