2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved name of test to evaluate

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2019-06-13 17:01:00 +02:00
parent b2a1db6485
commit f9da5e8236
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/twomartens/masterthesis/cli.py
View File

@ -138,14 +138,14 @@ def _auto_encoder_train(args: argparse.Namespace) -> None:
channels=3, train_epoch=args.num_epochs, batch_size=batch_size) channels=3, train_epoch=args.num_epochs, batch_size=batch_size)
def test(args: argparse.Namespace) -> None: def evaluate(args: argparse.Namespace) -> None:
if args.network == "ssd": if args.network == "ssd":
_ssd_test(args) _ssd_evaluate(args)
else: else:
raise NotImplementedError raise NotImplementedError
def _ssd_test(args: argparse.Namespace) -> None: def _ssd_evaluate(args: argparse.Namespace) -> None:
import glob import glob
import os import os
import pickle import pickle

14
src/twomartens/masterthesis/main.py
View File

@ -41,21 +41,21 @@ def main() -> None:
prepare_parser = sub_parsers.add_parser("prepare", help="Prepare SceneNet RGB-D ground truth") prepare_parser = sub_parsers.add_parser("prepare", help="Prepare SceneNet RGB-D ground truth")
train_parser = sub_parsers.add_parser("train", help="Train a network") train_parser = sub_parsers.add_parser("train", help="Train a network")
test_parser = sub_parsers.add_parser("test", help="Test a network") evaluate_parser = sub_parsers.add_parser("evaluate", help="Evaluate a network")
val_parser = sub_parsers.add_parser("val", help="Validate a network") val_parser = sub_parsers.add_parser("val", help="Validate a network")
# build sub parsers # build sub parsers
_build_prepare(prepare_parser) _build_prepare(prepare_parser)
_build_train(train_parser) _build_train(train_parser)
_build_val(val_parser) _build_val(val_parser)
_build_test(test_parser) _build_evaluate(evaluate_parser)
args = parser.parse_args() args = parser.parse_args()
if args.action == "train": if args.action == "train":
cli.train(args) cli.train(args)
elif args.action == "test": elif args.action == "test":
cli.test(args) cli.evaluate(args)
elif args.action == "val": elif args.action == "val":
cli.val(args) cli.val(args)
elif args.action == "prepare": elif args.action == "prepare":
@ -137,7 +137,7 @@ def _build_auto_encoder_val(parser: argparse.ArgumentParser) -> None:
parser.add_argument("iteration_trained", type=int, help="the training iteration") parser.add_argument("iteration_trained", type=int, help="the training iteration")
def _build_test(parser: argparse.ArgumentParser) -> None: def _build_evaluate(parser: argparse.ArgumentParser) -> None:
sub_parsers = parser.add_subparsers(dest="network") sub_parsers = parser.add_subparsers(dest="network")
sub_parsers.required = True sub_parsers.required = True
@ -145,11 +145,11 @@ def _build_test(parser: argparse.ArgumentParser) -> None:
ssd_parser = sub_parsers.add_parser("ssd", help="SSD") ssd_parser = sub_parsers.add_parser("ssd", help="SSD")
# build sub parsers # build sub parsers
_build_ssd_test(ssd_bayesian_parser) _build_ssd_evaluate(ssd_bayesian_parser)
_build_ssd_test(ssd_parser) _build_ssd_evaluate(ssd_parser)
def _build_ssd_test(parser: argparse.ArgumentParser) -> None: def _build_ssd_evaluate(parser: argparse.ArgumentParser) -> None:
parser.add_argument("--output_path", type=str, help="path to the output directory") parser.add_argument("--output_path", type=str, help="path to the output directory")
parser.add_argument("--evaluation_path", type=str, help="path to the directory for the evaluation results") parser.add_argument("--evaluation_path", type=str, help="path to the directory for the evaluation results")
parser.add_argument("iteration", type=int, help="the validation iteration to use") parser.add_argument("iteration", type=int, help="the validation iteration to use")