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.

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

Add ABACUS/lcao deepks interface to dpgen init and run. #705

Merged
merged 8 commits into from
Apr 24, 2022
Merged

Add ABACUS/lcao deepks interface to dpgen init and run. #705

merged 8 commits into from
Apr 24, 2022

Conversation

Liu-RX
Copy link
Collaborator

@Liu-RX Liu-RX commented Apr 20, 2022

The tests/data/test_coll_abacus.py test is also changed according to ABACUS 2.2.0 MD output format. Because of this, the test cannot pass now. It could pass when dpdata supports ABACUS 2.2.0 MD format.

@codecov-commenter
Copy link

codecov-commenter commented Apr 21, 2022

Codecov Report

Merging #705 (4e993a5) into devel (37df129) will decrease coverage by 0.11%.
The diff coverage is 44.35%.

@@            Coverage Diff             @@
##            devel     #705      +/-   ##
==========================================
- Coverage   34.05%   33.94%   -0.12%     
==========================================
  Files          92       92              
  Lines       16377    16541     +164     
==========================================
+ Hits         5578     5615      +37     
- Misses      10799    10926     +127     
Impacted Files Coverage Δ
dpgen/data/tools/create_random_disturb.py 0.00% <0.00%> (ø)
dpgen/generator/run.py 62.28% <18.86%> (-0.99%) ⬇️
dpgen/data/gen.py 48.47% <23.00%> (-2.38%) ⬇️
dpgen/generator/lib/abacus_scf.py 80.46% <85.88%> (-3.08%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 37df129...4e993a5. Read the comment docs.

@amcadmus
Copy link
Member

please update the requirement for dpdata to 0.2.6 https://github.com/deepmodeling/dpdata/releases/tag/0.2.6

add dpdata==0.2.6 to requirements.
@Liu-RX
Copy link
Collaborator Author

Liu-RX commented Apr 21, 2022

please update the requirement for dpdata to 0.2.6 https://github.com/deepmodeling/dpdata/releases/tag/0.2.6

Thank you for the update! I have added the requirement for dpdata and the checks have passed.

@wanghan-iapcm
Copy link
Contributor

Please also update the requirement in the setup.py, thank you

dpgen/setup.py

Line 20 in 37df129

install_requires=['numpy>=1.14.3', 'dpdata>=0.2.4', 'pymatgen>=2019.1.13', 'ase', 'monty>2.0.0', 'paramiko', 'custodian','GromacsWrapper>=0.8.0', 'dpdispatcher>=0.3.11']

update dpdata to 0.2.6
@Liu-RX
Copy link
Collaborator Author

Liu-RX commented Apr 21, 2022

Please also update the requirement in the setup.py, thank you

dpgen/setup.py

Line 20 in 37df129

install_requires=['numpy>=1.14.3', 'dpdata>=0.2.4', 'pymatgen>=2019.1.13', 'ase', 'monty>2.0.0', 'paramiko', 'custodian','GromacsWrapper>=0.8.0', 'dpdispatcher>=0.3.11']

setup.py has already been updated.

Copy link
Collaborator

@AnguseZhang AnguseZhang left a comment

Choose a reason for hiding this comment

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

A few changes are suggested.

README.md Outdated Show resolved Hide resolved
README.md Outdated
| *fp_style == ABACUS*
| **user_fp_params** | Dict | |Parameters for ABACUS INPUT. find detail [Here](https://github.com/deepmodeling/abacus-develop/blob/develop/doc/input-main.md#out-descriptor). If `deepks_model` is set, the model file should be in the pseudopotential directory.
| **fp_orb_files** | List | |List of atomic orbital files. The files should be in pseudopotential directory.
| **fp_dpks_descriptor** | String | |DeepKS descriptor file name. The file should be in pseudopotential directory.
Copy link
Collaborator

Choose a reason for hiding this comment

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

DeePKS?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes! Thank you for pointing out the problem.

"machine":{
"machine_type": "slurm",
"host_name": "localhost",
"port": 22,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you please update examples compatible with the new version of dpdispatcher ? Search "new dpdispatcher update note" in the manual https://github.com/deepmodeling/dpgen#set-up-machine

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Maybe I should remove the machine.json here and the same file in ABACUS-pw? The machine json file has no difference with the vasp example except for the "fp" command.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I have updated the file according to the https://github.com/deepmodeling/dpgen#set-up-machine. You could remove the machine.json as well. I think this example file is not that necessary.

@AnguseZhang AnguseZhang merged commit 25269cf into deepmodeling:devel Apr 24, 2022
@Liu-RX Liu-RX deleted the devel branch June 13, 2022 06:55
@Liu-RX Liu-RX restored the devel branch June 13, 2022 06:55
@Liu-RX Liu-RX deleted the devel branch June 13, 2022 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants