ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify how execute() returns

Browse Source
This commit is contained in:
Trung Nguyen
2024-10-22 23:21:37 -05:00
parent e2214fc4d6
commit 06207fd91e
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/regression-tests/run_tests.py
View File

@ -327,7 +327,12 @@ def iterate(lmp_binary, input_folder, input_list, config, results, progress_file
result = TestResult(name=input, output="", time="", status="passed") result = TestResult(name=input, output="", time="", status="passed")
# run the LAMMPS binary with the input script # run the LAMMPS binary with the input script
cmd_str, output, error, returncode, logfilename = execute(lmp_binary, config, input_test) status = execute(lmp_binary, config, input_test)
cmd_str = status['cmd_str']
output = status['stdout']
error = status['stderr']
returncode = status['returncode']
logfilename = status['logfilename']
# restore the nprocs value in the configuration # restore the nprocs value in the configuration
config['nprocs'] = saved_nprocs config['nprocs'] = saved_nprocs
@ -928,7 +933,14 @@ def execute(lmp_binary, config, input_file_name, generate_ref=False):
try: try:
p = subprocess.run(cmd_str, shell=True, text=True, capture_output=True, timeout=timeout) p = subprocess.run(cmd_str, shell=True, text=True, capture_output=True, timeout=timeout)
return cmd_str, p.stdout, p.stderr, p.returncode, logfilename status = {
'cmd_str': cmd_str,
'stdout': p.stdout,
'stderr': p.stderr,
'returncode': p.returncode,
'logfilename': logfilename,
}
return status
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
msg = f" Timeout for: {cmd_str} ({timeout}s expired)" msg = f" Timeout for: {cmd_str} ({timeout}s expired)"
@ -936,7 +948,14 @@ def execute(lmp_binary, config, input_file_name, generate_ref=False):
print(msg) print(msg)
error_str = f"timeout ({timeout}s expired)" error_str = f"timeout ({timeout}s expired)"
return cmd_str, "", error_str, -1, logfilename status = {
'cmd_str': cmd_str,
'stdout': "",
'stderr': error_str,
'returncode': -1,
'logfilename': logfilename,
}
return status
''' '''
get the reference walltime by running the lmp_binary with config with an input script in the bench/ folder get the reference walltime by running the lmp_binary with config with an input script in the bench/ folder