diff --git a/fixminer.sh b/fixminer.sh index 6354738..6a017af 100644 --- a/fixminer.sh +++ b/fixminer.sh @@ -1,6 +1,7 @@ #!/bin/bash +# conda activate fixminerEnv +expop PYTHONPATH=$(pwd) +export PYTHONPATH -source activate fixminerEnv - -PYTHONPATH=$(pwd) python -u python/main.py -root $(pwd)/python -job $2 -prop $1 +python -u python/main.py "$@" diff --git a/python/common/commons.py b/python/common/commons.py index 6b20bd7..71e36dd 100644 --- a/python/common/commons.py +++ b/python/common/commons.py @@ -159,22 +159,6 @@ def setEnv(args): logging.info('DATASET_DIR : %s', os.environ["DATASET_DIR"]) -def getRun(): - import argparse - parser = argparse.ArgumentParser(description='') - # parser.add_argument('-subject', dest='subject', help='Environment') - parser.add_argument('-root', dest='root', help='root folder') - parser.add_argument('-job', dest='job', help='job name') - parser.add_argument('-prop', dest='prop', help='property file') - - args = parser.parse_args() - - if args.root is None or args.job is None or args.prop is None: - parser.print_help() - raise AttributeError - return args - - def shellCallTemplate4jar(cmd, enc='utf-8'): process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=PIPE, shell=True, encoding=enc, diff --git a/python/main.py b/python/main.py index 23c9f02..3215104 100644 --- a/python/main.py +++ b/python/main.py @@ -1,7 +1,24 @@ from common.commons import * +import argparse + + +def parse_args(): + parser = argparse.ArgumentParser(description='') + parser.add_argument('prop', help='config.yml file path') + parser.add_argument('job', help='job name') + + args = parser.parse_args() + + args.root = str(Path(__file__).parent.absolute()) + + if args.root is None or args.job is None or args.prop is None: + parser.print_help() + exit(-1) + return args + if __name__ == '__main__': - args = getRun() + args = parse_args() setLogg() setEnv(args) @@ -9,13 +26,9 @@ if __name__ == '__main__': job = args.job from python.settings import * - # job = "cluster" pd.options.mode.chained_assignment = None - # subject = 'ALL' - # rootType = 'if' - - print(job) + print(f'Executing {job}...') if job == 'dataset4j': from dataset4j import create_dataset