From b7484ef17860e493b14630a03399ee73e88b411c Mon Sep 17 00:00:00 2001 From: Ganesh Gore Date: Tue, 20 Aug 2019 15:58:19 -0600 Subject: [PATCH] Removed traces of old template file --- openfpga_flow/scripts/run_fpga_flow.py | 4 ++-- openfpga_flow/scripts/run_fpga_task.py | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/openfpga_flow/scripts/run_fpga_flow.py b/openfpga_flow/scripts/run_fpga_flow.py index 65e153073..2a01e561e 100644 --- a/openfpga_flow/scripts/run_fpga_flow.py +++ b/openfpga_flow/scripts/run_fpga_flow.py @@ -261,7 +261,6 @@ def validate_command_line_arguments(): if not any([getattr(args, i, 0) for i in eachdep.split("|")]): clean_up_and_exit("'%s' argument depends on (%s) argumets"% (eacharg, ", ".join(dependent).replace("|", " or "))) - exit() # Filter provided architecrue files args.arch_file = os.path.abspath(args.arch_file) @@ -796,6 +795,7 @@ def run_command(taskname, logfile, command, exit_if_fail=True): except (Exception, subprocess.CalledProcessError) as e: logger.exception("failed to execute %s" % taskname) process_failed_vpr_run(e.output) + print(e.output) if exit_if_fail: clean_up_and_exit("Failed to run %s task" % taskname) return None @@ -811,7 +811,7 @@ def process_failed_vpr_run(vpr_output): if __name__ == "__main__": # Setting up print and logging system - logging.basicConfig(level=logging.INFO, stream=sys.stdout, + logging.basicConfig(level=logging.DEBUG, stream=sys.stdout, format='%(levelname)s - %(message)s') logger = logging.getLogger('OpenFPGA_Flow_Logs') diff --git a/openfpga_flow/scripts/run_fpga_task.py b/openfpga_flow/scripts/run_fpga_task.py index 0612700d4..6d1bf4a4b 100644 --- a/openfpga_flow/scripts/run_fpga_task.py +++ b/openfpga_flow/scripts/run_fpga_task.py @@ -191,16 +191,6 @@ def create_run_command(curr_job_dir, archfile, benchmark_obj, task_conf): if not os.path.isdir(gc["misc_dir"]): clean_up_and_exit("Miscellaneous directory does not exist") - fpga_flow_script = os.path.join(gc["misc_dir"], "fpga_flow_template.sh") - if not os.path.isfile(fpga_flow_script): - clean_up_and_exit("Missing fpga_flow script template %s" % - fpga_flow_script) - - fpga_flow_conf_tmpl = os.path.join(gc["misc_dir"], "fpga_flow_script.conf") - if not os.path.isfile(fpga_flow_conf_tmpl): - clean_up_and_exit("fpga_flow configuration tempalte is missing %s" % - fpga_flow_conf_tmpl) - # = = = = = = = = = = = = Create execution folder = = = = = = = = = = = = if os.path.isdir(curr_job_dir): question = "One the result directory already exist.\n"