Merge remote-tracking branch 'origin/ganesh_dev' into dev

This commit is contained in:
Ganesh Gore 2019-09-06 11:49:38 -04:00
commit d55b7e9497
1 changed files with 8 additions and 4 deletions

View File

@ -255,6 +255,7 @@ def generate_each_task_actions(taskname):
"name": "%02d_arch%s_%s" % (indx, bench["top_module"], lbl), "name": "%02d_arch%s_%s" % (indx, bench["top_module"], lbl),
"run_dir": flow_run_dir, "run_dir": flow_run_dir,
"commands": command, "commands": command,
"finished" : False,
"status": False}) "status": False})
logger.info('Found %d Architectures %d Benchmarks & %d Script Parameters' % logger.info('Found %d Architectures %d Benchmarks & %d Script Parameters' %
@ -343,7 +344,7 @@ def strip_child_logger_info(line):
logger.info(line) logger.info(line)
def run_single_script(s, eachJob): def run_single_script(s, eachJob, job_list):
logger.debug('Added job in pool') logger.debug('Added job in pool')
with s: with s:
logger.debug("Running OpenFPGA flow with " + logger.debug("Running OpenFPGA flow with " +
@ -383,16 +384,19 @@ def run_single_script(s, eachJob):
else str(timediff) else str(timediff)
logger.info("%s Finished with returncode %d, Time Taken %s " % logger.info("%s Finished with returncode %d, Time Taken %s " %
(name, process.returncode, timestr)) (name, process.returncode, timestr))
eachJob["finished"] = True
no_of_finished_job = sum([ not eachJ["finished"] for eachJ in job_list])
logger.info("***** %d runs pending *****" % (no_of_finished_job))
def run_actions(job_run_list): def run_actions(job_list):
thread_sema = threading.Semaphore(args.maxthreads) thread_sema = threading.Semaphore(args.maxthreads)
thred_list = [] thred_list = []
for index, eachjob in enumerate(job_run_list): for index, eachjob in enumerate(job_list):
JobID = 'Job_%02d' % (index+1) JobID = 'Job_%02d' % (index+1)
logger.info("Running %s = %s" % (JobID, eachjob["name"])) logger.info("Running %s = %s" % (JobID, eachjob["name"]))
t = threading.Thread(target=run_single_script, t = threading.Thread(target=run_single_script,
name=JobID, args=(thread_sema, eachjob)) name=JobID, args=(thread_sema, eachjob, job_list))
t.start() t.start()
thred_list.append(t) thred_list.append(t)
for eachthread in thred_list: for eachthread in thred_list: