Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify post_fp_cp2k, adapt to SCF not converged situation. #1562

Open
wants to merge 5 commits into
base: devel
Choose a base branch
from
Open

Modify post_fp_cp2k, adapt to SCF not converged situation. #1562

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
169183e
Modify the post_fp_cp2k function to generate multisystem data. Allows…
dulinhan Apr 10, 2024
c06a35f
Increase the robustness of cp2k post fp (when scf not converged occurs)
dulinhan May 28, 2024
0663bd3
Merge branch 'devel' of https://github.com/dulinhan/dpgen into modify…
dulinhan Jun 7, 2024
4214d77
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
01581e9
Merge branch 'devel' into modify_post_fp_cp2k
dulinhan Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dpgen/generator/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4497,14 +4497,22 @@
sys_output = glob.glob(os.path.join(work_path, f"task.{ss}.*/output"))
sys_output.sort()
tcount += len(sys_output)
log_file_path = os.path.join(work_path, f"{ss}.fp-fail.log")
all_sys = dpdata.MultiSystems(type_map=jdata["type_map"])
for oo in sys_output:
with open(oo) as file:
content = file.read()
if "SCF run NOT converged" in content:
with open(log_file_path, "a") as log_file:
log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
continue

Check warning on line 4508 in dpgen/generator/run.py

View check run for this annotation

Codecov / codecov/patch

dpgen/generator/run.py#L4506-L4508 

Added lines #L4506 - L4508 were not covered by tests
Comment on lines +4503 to +4508
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move these lines after _sys=dpdata.LabeledSystem

Suggested change
with open(oo) as file:
content = file.read()
if "SCF run NOT converged" in content:
with open(log_file_path, "a") as log_file:
log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
continue
if len(_sys) == 0:
with open(log_file_path, "a") as log_file:
log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
continue

Comment on lines +4505 to +4508
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move SCF check and logging after _sys instantiation

To ensure _sys is only instantiated if SCF converges, move these lines after _sys=dpdata.LabeledSystem.

-            if "SCF run NOT converged" in content:
-                with open(log_file_path, "a") as log_file:
-                    log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
-                continue
            _sys = dpdata.LabeledSystem(
                oo, fmt="cp2kdata/e_f", type_map=jdata["type_map"]
            )
+            if "SCF run NOT converged" in content:
+                with open(log_file_path, "a") as log_file:
+                    log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
+                continue
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if "SCF run NOT converged" in content:
with open(log_file_path, "a") as log_file:
log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
continue
_sys = dpdata.LabeledSystem(
oo, fmt="cp2kdata/e_f", type_map=jdata["type_map"]
)
if "SCF run NOT converged" in content:
with open(log_file_path, "a") as log_file:
log_file.write(f"Skipping file {oo} due to SCF run NOT converged\n")
continue

_sys = dpdata.LabeledSystem(
oo, fmt="cp2kdata/e_f", type_map=jdata["type_map"]
)
all_sys.append(_sys)
icount += 1

icount += len(all_sys)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate icount increment

icount is incremented twice. Remove the duplicate increment.

-        icount += len(all_sys)

Committable suggestion was skipped due to low confidence.

if (all_sys is not None) and (len(all_sys) > 0):
sys_data_path = os.path.join(work_path, f"data.{ss}")
all_sys.to_deepmd_raw(sys_data_path)
Expand Down