diff --git a/research/cv/Pix2Pix/README.md b/research/cv/Pix2Pix/README.md
index d677e6c199d9eaba3dacc6606f4c6ebd511109cd..9a1a025dfe62c69c7671483d1b50693a6f3c1d48 100644
--- a/research/cv/Pix2Pix/README.md
+++ b/research/cv/Pix2Pix/README.md
@@ -171,7 +171,7 @@ python train.py --device_target [Ascend] --device_id [0]
- running distributed trainning on Ascend with fixed parameters
```python
-bash run_distribute_train_ascend.sh [DEVICE_NUM] [DISTRIBUTE] [RANK_TABLE_FILE] [DATASET_PATH]
+bash run_distribute_train_ascend.sh [RANK_TABLE_FILE] [DATASET_PATH]
```
- running on GPU with fixed parameters
@@ -185,7 +185,7 @@ bash scripts/run_train.sh [DEVICE_TARGET] [DEVICE_ID]
- running distributed trainning on GPU with fixed parameters
```python
-bash run_distribute_train_gpu.sh [DATASET_PATH] [DATASET_NAME] [DEVICE_NUM]
+bash run_distribute_train_gpu.sh [DATASET_PATH] [DATASET_NAME]
```
## [Evaluation](#contents)
diff --git a/research/cv/Pix2Pix/scripts/run_distribute_train_ascend.sh b/research/cv/Pix2Pix/scripts/run_distribute_train_ascend.sh
index 38d60622b46f858448f6e5693d1133588e70549e..f9469a913a6212e3dcabaa7b71668850c3918708 100644
--- a/research/cv/Pix2Pix/scripts/run_distribute_train_ascend.sh
+++ b/research/cv/Pix2Pix/scripts/run_distribute_train_ascend.sh
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-if [ $# != 4 ]
+if [ $# != 2 ]
then
- echo "Usage: sh run_distribute_train.sh [DEVICE_NUM] [DISTRIBUTE] [RANK_TABLE_FILE] [DATASET_PATH]"
+ echo "Usage: sh run_distribute_train.sh [RANK_TABLE_FILE] [DATASET_PATH]"
exit 1
fi
@@ -29,12 +29,12 @@ get_real_path(){
fi
}
-export RANK_SIZE=$1
-export DISTRIBUTE=$2
-export RANK_TABLE_FILE=$(get_real_path $3)
-export DATASET_PATH=$(get_real_path $4)
+export RANK_SIZE=8
+export DEVICE_NUM=8
+export RANK_TABLE_FILE=$(get_real_path $1)
+export DATASET_PATH=$(get_real_path $2)
-for((i=0;i<RANK_SIZE;i++))
+for((i=0;i<$DEVICE_NUM;i++))
do
export DEVICE_ID=$i
rm -rf ./train_parallel$i
@@ -49,10 +49,11 @@ do
cp -r ../*.yaml ./train_parallel$i
cd ./train_parallel$i || exit
export RANK_ID=$i
+ export DEVICE_ID=$i
echo "start training for rank $i, device $DEVICE_ID"
env > env.log
- python train.py --run_distribute=$DISTRIBUTE --device_target Ascend --device_num=$RANK_SIZE \
+ python train.py --run_distribute 1 --device_target Ascend \
--device_id=$DEVICE_ID --train_data_dir $DATASET_PATH &> log &
cd ..
done
diff --git a/research/cv/Pix2Pix/scripts/run_distribute_train_gpu.sh b/research/cv/Pix2Pix/scripts/run_distribute_train_gpu.sh
index 9ecdcf1ab0b38be6dcb27e7ba2be606ada308e21..9d0d20aec4d4863d470c3d33e17ba011f6f1b39b 100644
--- a/research/cv/Pix2Pix/scripts/run_distribute_train_gpu.sh
+++ b/research/cv/Pix2Pix/scripts/run_distribute_train_gpu.sh
@@ -14,9 +14,9 @@
# limitations under the License.
# ============================================================================
-if [ $# != 3 ]
+if [ $# != 2 ]
then
- echo "Usage: bash run_distribute_train_gpu.sh [DATASET_PATH] [DATASET_NAME] [DEVICE_NUM]"
+ echo "Usage: bash run_distribute_train_gpu.sh [DATASET_PATH] [DATASET_NAME]"
exit 1
fi
@@ -37,8 +37,8 @@ then
exit 1
fi
-export DEVICE_NUM=$3
-export RANK_SIZE=$3
+export DEVICE_NUM=4
+export RANK_SIZE=4
rm -rf ./train_parallel
mkdir ./train_parallel
@@ -55,11 +55,11 @@ cd ./train_parallel || exit
if [ $2 == 'facades' ];
then
- mpirun -n $3 --output-filename log_output --merge-stderr-to-stdout --allow-run-as-root python train.py --device_target GPU \
- --run_distribute 1 --device_num $3 --dataset_size 400 --train_data_dir $PATH1 --pad_mode REFLECT &> log &
+ mpirun -n $DEVICE_NUM --output-filename log_output --merge-stderr-to-stdout --allow-run-as-root python train.py --device_target GPU \
+ --run_distribute 1 --dataset_size 400 --train_data_dir $PATH1 --pad_mode REFLECT &> log &
elif [ $2 == 'maps' ];
then
- mpirun --allow-run-as-root -n $3 --output-filename log_output --merge-stderr-to-stdout \
- python train.py --device_target GPU --device_num $3 --dataset_size 1096 \
+ mpirun --allow-run-as-root -n $DEVICE_NUM --output-filename log_output --merge-stderr-to-stdout \
+ python train.py --device_target GPU --dataset_size 1096 \
--run_distribute 1 --train_data_dir $PATH1 --pad_mode REFLECT &> log &
fi
diff --git a/research/cv/Pix2Pix/scripts/run_train.sh b/research/cv/Pix2Pix/scripts/run_train.sh
index fa08a4afa74f820b8c7453a35912e46d720c80ba..bcdbef9424ccdbc5f0f6714c40e10320d186e435 100644
--- a/research/cv/Pix2Pix/scripts/run_train.sh
+++ b/research/cv/Pix2Pix/scripts/run_train.sh
@@ -14,9 +14,9 @@
# limitations under the License.
echo "====================================================================================================================="
-echo "Please run the train as: "
-echo "python train.py device_target device_id"
-echo "for example: python train.py --device_target GPU --device_id 0"
+echo "Run this script as: "
+echo "bash run_train.sh [device_target] [device_id]"
+echo "for example: bash run_train.sh --device_target GPU --device_id 0"
echo "====================================================================================================================="
if [ $# != 2 ]
@@ -32,10 +32,10 @@ mkdir ./train/results/fake_img
mkdir ./train/results/loss_show
mkdir ./train/results/ckpt
mkdir ./train/results/predict
-cp ./*.py ./train
-cp ./scripts/*.sh ./train
-cp -r ./src ./train
-cp -r ./*.yaml ./train
+cp ../*.py ./train
+cp ../scripts/*.sh ./train
+cp -r ../src ./train
+cp -r ../*.yaml ./train
cd ./train || exit
python train.py --device_target $1 --device_id $2 &> log &