diff --git a/.github/workflows/kokkos-regression.yaml b/.github/workflows/kokkos-regression.yaml index 661c646c2f..7da35add60 100644 --- a/.github/workflows/kokkos-regression.yaml +++ b/.github/workflows/kokkos-regression.yaml @@ -75,7 +75,7 @@ jobs: python3 tools/regression-tests/run_tests.py \ --lmp-bin=build/lmp \ --config-file=tools/regression-tests/config_kokkos.yaml \ - --example-folders="examples/colloid;examples/melt;examples/micelle;examples/threebody;examples/snap;" + --example-folders="examples/colloid;examples/melt;examples/micelle;examples/threebody;examples/snap" \ --output-file=output.xml \ --progress-file=progress.yaml \ --log-file=run.log diff --git a/tools/regression-tests/run_tests.py b/tools/regression-tests/run_tests.py index dae6b2f22f..a73eceb975 100755 --- a/tools/regression-tests/run_tests.py +++ b/tools/regression-tests/run_tests.py @@ -656,7 +656,6 @@ def iterate(lmp_binary, input_folder, input_list, config, results, progress_file msg = f" {num_abs_failed} abs diff checks failed." print(msg) logger.info(msg) - #result.status = f"abs_diff_failed: {num_abs_failed}, " if verbose == True: for out in failed_abs_output: print(f" - {out}") @@ -665,7 +664,6 @@ def iterate(lmp_binary, input_folder, input_list, config, results, progress_file msg = f" {num_rel_failed} rel diff checks failed." print(msg) logger.info(msg) - #result.status += f"rel_diff_failed: {num_rel_failed}" if verbose == True: for out in failed_rel_output: print(f" - {out}") @@ -674,12 +672,11 @@ def iterate(lmp_binary, input_folder, input_list, config, results, progress_file msg = f" all {num_checks} checks passed." print(msg) logger.info(msg) - #result.status = f"all {num_checks} checks passed." num_passed = num_passed + 1 else: num_error = num_error + 1 - result.status = f"abs_diff_failed: {num_abs_failed}, rel_diff_failed: {num_rel_failed}" + result.status = f" 'abs_diff_failed': '{num_abs_failed}', 'rel_diff_failed': '{num_rel_failed}' " results.append(result) # check if memleak detects from valgrind run (need to replace "mpirun" -> valgrind --leak-check=yes mpirun") @@ -691,12 +688,12 @@ def iterate(lmp_binary, input_folder, input_list, config, results, progress_file msg += ", memory leaks detected" num_memleak = num_memleak + 1 - progress.write(f"{{ '{input}': {{ 'folder': '{input_folder}', 'status': '{msg}', 'failed_checks': {{ '{result.status}' }}, 'walltime': '{walltime}', 'walltime_norm': '{walltime_norm}' }} }}\n") + progress.write(f"{{ '{input}': {{ 'folder': '{input_folder}', 'status': '{msg}', 'failed_checks': {{ {result.status} }}, 'walltime': '{walltime}', 'walltime_norm': '{walltime_norm}' }} }}\n") progress.close() # write to failure if there is any numerical failed check if num_abs_failed > 0 or num_rel_failed > 0: - failure.write(f"{{ '{input}': {{ 'folder': '{input_folder}', 'status': '{msg}', 'failed_checks': '{{ '{result.status}' }}, 'walltime': '{walltime}', 'walltime_norm': '{walltime_norm}' }} }}\n") + failure.write(f"{{ '{input}': {{ 'folder': '{input_folder}', 'status': '{msg}', 'failed_checks': '{{ {result.status} }}, 'walltime': '{walltime}', 'walltime_norm': '{walltime_norm}' }} }}\n") # count the number of completed runs num_completed = num_completed + 1