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

Fixed log file name issues, ignored log files that don't give thermo ouput as normally expected

Browse Source
This commit is contained in:
Trung Nguyen
2024-07-16 14:46:13 -05:00
parent 44edc61a00
commit afa44e931b
2 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/regression-tests/config.yaml
View File

@ -30,7 +30,12 @@
rel: 1e-4 rel: 1e-4
skip: skip:
[ in.rigid.poems3, [ in.rigid.poems3,
in.rigid.poems4 in.rigid.poems4,
in.rigid.poems5,
in.peptide,
in.voronoi,
in.voronoi.2d,
in.voronoi.data,
] ]
nugget: 1.0 nugget: 1.0

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

@ -293,6 +293,8 @@ def iterate(lmp_binary, input_list, config, results, removeAnnotatedInput=False)
# skip the input file if listed # skip the input file if listed
if 'skip' in config: if 'skip' in config:
if input in config['skip']: if input in config['skip']:
logger.info(f"SKIPPED: {input} as specified in the configuration file {configFileName}")
test_id = test_id + 1
continue continue
str_t = "\nRunning " + input + f" ({test_id+1}/{num_tests})" str_t = "\nRunning " + input + f" ({test_id+1}/{num_tests})"
@ -320,30 +322,34 @@ def iterate(lmp_binary, input_list, config, results, removeAnnotatedInput=False)
str_t = "\nRunning " + input_test + f" ({test_id+1}/{num_tests})" str_t = "\nRunning " + input_test + f" ({test_id+1}/{num_tests})"
else: else:
input_test = input input_test = input
print(str_t) print(str_t)
print(f"-"*len(str_t)) print(f"-"*len(str_t))
logger.info(str_t)
logger.info(f"-"*len(str_t))
# check if a log file exists in the current folder: log.DDMMMYY.basename.[nprocs] # check if a log file exists in the current folder: log.DDMMMYY.basename.[nprocs]
basename = input_test.replace('in.','') basename = input_test.replace('in.','')
logfile_exist = False logfile_exist = False
# if there are multiple log files for different number of procs, pick the maximum number # if there are multiple log files for different number of procs, pick the maximum number
cmd_str = "ls log.*"
p = subprocess.run(cmd_str, shell=True, text=True, capture_output=True)
logfile_list = p.stdout.split('\n')
logfile_list.remove('')
max_np = 1 max_np = 1
for file in os.listdir('.'): for file in logfile_list:
# looks for pattern log.DDMMMYY.basename.[nprocs] # looks for pattern log.{date}.{basename}.g++.{nprocs}
# ignore the first 12 characteris log.DDMMMYY. # get the date from the log files
file_name_removed_date = file[12:] date = file.split('.',2)[1]
pattern = f'{basename}.*' pattern = f'log.{date}.{basename}.*'
if fnmatch.fnmatch(file_name_removed_date, pattern): if fnmatch.fnmatch(file, pattern):
p = file.rsplit('.', 1) p = file.rsplit('.', 1)
if max_np < int(p[1]): if max_np < int(p[1]):
max_np = int(p[1]) max_np = int(p[1])
logfile_exist = True logfile_exist = True
thermo_ref_file = file thermo_ref_file = file
# if the maximum number of procs is different from the value in the configuration file # if the maximum number of procs is different from the value in the configuration file
# then override the setting for this input script # then override the setting for this input script
saved_nprocs = config['nprocs'] saved_nprocs = config['nprocs']
@ -363,7 +369,7 @@ def iterate(lmp_binary, input_list, config, results, removeAnnotatedInput=False)
num_runs_ref = len(thermo_ref) num_runs_ref = len(thermo_ref)
else: else:
logger.info(f"SKIPPED: {thermo_ref_file} does not exist in the working directory.") logger.info(f"SKIPPED: {thermo_ref_file} does not exist in the working directory.")
result.status = "skipped" result.status = "skipped due to missing the log file"
results.append(result) results.append(result)
test_id = test_id + 1 test_id = test_id + 1
continue continue
@ -380,7 +386,7 @@ def iterate(lmp_binary, input_list, config, results, removeAnnotatedInput=False)
# process error code from the run # process error code from the run
if os.path.isfile("log.lammps") == False: if os.path.isfile("log.lammps") == False:
logger.info(f"ERROR: No log.lammps generated with {input_test} with return code {returncode}. Check the log file for the run output.\n") logger.info(f"ERROR: No log.lammps generated with {input_test} with return code {returncode}. Check the {log_file} for the run output.\n")
logger.info(f"\n{input_test}:") logger.info(f"\n{input_test}:")
logger.info(f"\n{error}") logger.info(f"\n{error}")
test_id = test_id + 1 test_id = test_id + 1
@ -398,12 +404,12 @@ def iterate(lmp_binary, input_list, config, results, removeAnnotatedInput=False)
result.status = "unrecognized command" result.status = "unrecognized command"
else: else:
result.status = "error" result.status = "error"
logger.info(f"ERROR: Failed with {input_test} due to {result.status}. Check the log file for the run output.\n") logger.info(f"ERROR: Failed with {input_test} due to {result.status}.\n")
results.append(result) results.append(result)
test_id = test_id + 1 test_id = test_id + 1
continue continue
logger.info(f"Comparing thermo output from log.lammps against the reference log file {thermo_ref_file}") print(f"Comparing thermo output from log.lammps against the reference log file {thermo_ref_file}")
if num_runs != num_runs_ref: if num_runs != num_runs_ref:
logger.info(f"ERROR: Number of runs in log.lammps ({num_runs}) is not the same as that in the reference log ({num_runs_ref})") logger.info(f"ERROR: Number of runs in log.lammps ({num_runs}) is not the same as that in the reference log ({num_runs_ref})")
result.status = "error" result.status = "error"
@ -506,6 +512,8 @@ def iterate(lmp_binary, input_list, config, results, removeAnnotatedInput=False)
results.append(result) results.append(result)
str_t = f"Finished " + input_test
print(str_t)
print("-"*(5*width+4)) print("-"*(5*width+4))
test_id = test_id + 1 test_id = test_id + 1
@ -534,7 +542,7 @@ if __name__ == "__main__":
dry_run = False dry_run = False
# distribute the total number of input scripts over the workers # distribute the total number of input scripts over the workers
num_workers = 16 num_workers = 1
# parse the arguments # parse the arguments
parser = ArgumentParser() parser = ArgumentParser()
@ -565,8 +573,7 @@ if __name__ == "__main__":
example_toplevel = args.example_toplevel example_toplevel = args.example_toplevel
if args.example_folders != "": if args.example_folders != "":
example_subfolders = args.example_folders.split(';') example_subfolders = args.example_folders.split(';')
print("Example folders:")
print(example_subfolders)
genref = args.genref genref = args.genref
verbose = args.verbose verbose = args.verbose
log_file = args.logfile log_file = args.logfile
@ -580,7 +587,7 @@ if __name__ == "__main__":
with open(configFileName, 'r') as f: with open(configFileName, 'r') as f:
config = yaml.load(f, Loader=Loader) config = yaml.load(f, Loader=Loader)
absolute_path = os.path.abspath(configFileName) absolute_path = os.path.abspath(configFileName)
print(f"Regression tests with settings defined in {absolute_path}") print(f"Regression tests with settings defined in the configuration file {absolute_path}")
# check if lmp_binary is specified in the config yaml # check if lmp_binary is specified in the config yaml
if lmp_binary == "": if lmp_binary == "":
@ -598,6 +605,13 @@ if __name__ == "__main__":
print(f"- Active compile flags: {compile_flags}") print(f"- Active compile flags: {compile_flags}")
print(f"- List of {len(packages)} installed packages: {packages}") print(f"- List of {len(packages)} installed packages: {packages}")
if len(example_subfolders) > 0:
print("- Example folders to test:")
print(example_subfolders)
if example_toplevel != "":
print("- Top-level example folder:")
print(example_toplevel)
folder_list = [] folder_list = []
if len(example_toplevel) != 0: if len(example_toplevel) != 0:
# getting the list of all the input files because there are subfolders (e.g. PACKAGES) under the top level # getting the list of all the input files because there are subfolders (e.g. PACKAGES) under the top level
@ -777,7 +791,7 @@ if __name__ == "__main__":
passed_tests = iterate(input_list, config, results) passed_tests = iterate(input_list, config, results)
print("Summary:") print("Summary:")
print(f" - {passed_tests} passed / {total_tests} tests") print(f" - {passed_tests} numerical tests passed / {total_tests} tests")
print(f" - Details are given in {output_file}.") print(f" - Details are given in {output_file}.")