From 061ea3c650c8be7b2ef02204c6d1c549813d67d7 Mon Sep 17 00:00:00 2001
From: Yuhao Wang <45590791+cnstark@users.noreply.github.com>
Date: Sun, 24 Apr 2022 14:51:26 +0800
Subject: [PATCH] fix: examples training code (#53)

* fix: examples training code

* fix
---
 examples/linear_regression/README.md           |  2 +-
 examples/linear_regression/train.py            | 18 ------------------
 examples/mnist/README.md                       |  8 ++++----
 examples/mnist/{config => configs}/__init__.py |  0
 .../mnist/{config => configs}/mnist_1x_cfg.py  |  0
 .../mnist/{config => configs}/mnist_cpu_cfg.py |  0
 .../{config => configs}/mnist_lr_cpu_cfg.py    |  0
 examples/mnist/train.py                        | 18 ------------------
 examples/mnist/validate.py                     |  2 --
 9 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 examples/linear_regression/train.py
 rename examples/mnist/{config => configs}/__init__.py (100%)
 rename examples/mnist/{config => configs}/mnist_1x_cfg.py (100%)
 rename examples/mnist/{config => configs}/mnist_cpu_cfg.py (100%)
 rename examples/mnist/{config => configs}/mnist_lr_cpu_cfg.py (100%)
 delete mode 100644 examples/mnist/train.py

diff --git a/examples/linear_regression/README.md b/examples/linear_regression/README.md
index 614fcef..a086718 100644
--- a/examples/linear_regression/README.md
+++ b/examples/linear_regression/README.md
@@ -5,5 +5,5 @@
 * CPU
 
 ```shell
-python train.py -c linear_regression_cpu_cfg.py
+easytrain -c linear_regression_cpu_cfg.py
 ```
diff --git a/examples/linear_regression/train.py b/examples/linear_regression/train.py
deleted file mode 100644
index 5234d53..0000000
--- a/examples/linear_regression/train.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import sys
-sys.path.append('../..')
-from argparse import ArgumentParser
-
-from easytorch import launch_training
-
-
-def parse_args():
-    parser = ArgumentParser(description='Welcome to EasyTorch!')
-    parser.add_argument('-c', '--cfg', help='training config', required=True)
-    parser.add_argument('--gpus', help='visible gpus', type=str)
-    return parser.parse_args()
-
-
-if __name__ == "__main__":
-    args = parse_args()
-
-    launch_training(args.cfg, args.gpus)
diff --git a/examples/mnist/README.md b/examples/mnist/README.md
index e34ff9a..e5c5b3d 100644
--- a/examples/mnist/README.md
+++ b/examples/mnist/README.md
@@ -5,13 +5,13 @@
 * CPU
 
 ```shell
-python train.py -c config\mnist_cpu_cfg.py
+easytrain -c configs/mnist_cpu_cfg.py
 ```
 
 * GPU (1x)
 
 ```shell
-python train.py -c config\mnist_1x_cfg.py --gpus 0
+easytrain -c configs/mnist_1x_cfg.py --gpus 0
 ```
 
 ## Validate
@@ -19,11 +19,11 @@ python train.py -c config\mnist_1x_cfg.py --gpus 0
 * CPU
 
 ```shell
-python validate.py -c config\mnist_cpu_cfg.py
+python validate.py -c configs/mnist_cpu_cfg.py
 ```
 
 * GPU (1x)
 
 ```shell
-python validate.py -c config\mnist_1x_cfg.py --gpus 0
+python validate.py -c configs/mnist_1x_cfg.py --gpus 0
 ```
diff --git a/examples/mnist/config/__init__.py b/examples/mnist/configs/__init__.py
similarity index 100%
rename from examples/mnist/config/__init__.py
rename to examples/mnist/configs/__init__.py
diff --git a/examples/mnist/config/mnist_1x_cfg.py b/examples/mnist/configs/mnist_1x_cfg.py
similarity index 100%
rename from examples/mnist/config/mnist_1x_cfg.py
rename to examples/mnist/configs/mnist_1x_cfg.py
diff --git a/examples/mnist/config/mnist_cpu_cfg.py b/examples/mnist/configs/mnist_cpu_cfg.py
similarity index 100%
rename from examples/mnist/config/mnist_cpu_cfg.py
rename to examples/mnist/configs/mnist_cpu_cfg.py
diff --git a/examples/mnist/config/mnist_lr_cpu_cfg.py b/examples/mnist/configs/mnist_lr_cpu_cfg.py
similarity index 100%
rename from examples/mnist/config/mnist_lr_cpu_cfg.py
rename to examples/mnist/configs/mnist_lr_cpu_cfg.py
diff --git a/examples/mnist/train.py b/examples/mnist/train.py
deleted file mode 100644
index 5234d53..0000000
--- a/examples/mnist/train.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import sys
-sys.path.append('../..')
-from argparse import ArgumentParser
-
-from easytorch import launch_training
-
-
-def parse_args():
-    parser = ArgumentParser(description='Welcome to EasyTorch!')
-    parser.add_argument('-c', '--cfg', help='training config', required=True)
-    parser.add_argument('--gpus', help='visible gpus', type=str)
-    return parser.parse_args()
-
-
-if __name__ == "__main__":
-    args = parse_args()
-
-    launch_training(args.cfg, args.gpus)
diff --git a/examples/mnist/validate.py b/examples/mnist/validate.py
index da722c3..04e4ca5 100644
--- a/examples/mnist/validate.py
+++ b/examples/mnist/validate.py
@@ -1,5 +1,3 @@
-import sys
-sys.path.append('../..')
 from argparse import ArgumentParser
 
 from easytorch import launch_runner, Runner