Skip to content

Update the output of OFDFT, particularly for the ML part#7383

Merged
mohanchen merged 13 commits into
deepmodeling:developfrom
mohanchen:20260526-MPN
Jun 4, 2026
Merged

Update the output of OFDFT, particularly for the ML part#7383
mohanchen merged 13 commits into
deepmodeling:developfrom
mohanchen:20260526-MPN

Conversation

@mohanchen
Copy link
Copy Markdown
Collaborator

Update the output of OFDFT, particularly for the ML part

abacus_fixer added 2 commits May 26, 2026 09:41
Summary of changes:
1. Modified ML_Base::set_device() to accept std::ostream& ofs_running parameter instead of using std::cout directly
2. Updated KEDF_ML::set_para() to pass ofs_running through the call chain
3. Modified KEDF_ML::init_data() to accept ofs_running parameter
4. Updated NN_OFImpl constructor to accept ofs_running parameter for logging nnode/nlayer
5. Modified Cal_MLKEDF_Descriptors::set_para() to accept ofs_running parameter for logging nkernel
6. Updated ML_EXX class methods (set_para, init_data, localTest) to use ofs_running
7. Updated all call sites to pass GlobalV::ofs_running
8. Changed 'NN' to 'Neural Network' in device initialization messages
9. Fixed 'WARNING: ML >= TF' message in KEDF_Manager::get_energy() to use ofs_running
10. Reformatted KEDF_ML::set_para() and cal_tool->set_para() calls with one parameter per line

All ML KEDF related output messages now write to the running log file instead of stdout.
@mohanchen mohanchen requested a review from zzlinpku May 26, 2026 01:45
@mohanchen mohanchen added Refactor Refactor ABACUS codes The Absolute Zero Reduce the "entropy" of the code to 0 labels May 26, 2026
Comment thread tests/integrate/Autotest.sh Outdated
Comment thread source/source_pw/module_ofdft/nn_of.cpp
abacus_fixer added 2 commits May 29, 2026 17:28
Copy link
Copy Markdown
Collaborator

@zzlinpku zzlinpku left a comment

Choose a reason for hiding this comment

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

Thanks for this PR! The direction of redirecting diagnostic output from std::cout to the log stream (GlobalV::ofs_running) is exactly right — computational libraries should not pollute stdout with debug/info messages. The const std::string& improvement in set_device and the "NN" → "Neural Network" rename are also nice touches.

I left a few inline comments below. The main items to address:

  1. Unused parameter warning in pot_ml_exx_label.cppofs_running is added to init_data() but not used in the function body.
  2. Inconsistent leading space in two files where " Default type: " has a leading space that was not in the original message.
  3. Typo — "unaviable" → "unavailable".

Also noted (not in diff, worth checking):

  • kedf_ml.cpp:140 (get_energy) still has a bare std::cout << "energy" << energy << std::endl; that was not converted. If it's in scope for this PR, consider passing ofs_running to that method as well.
  • ml_base.cpp:206,214 (dumpTensor, dumpMatrix) still use std::cout — these may be out of scope, but flagging for awareness.

Comment thread source/source_estate/module_pot/pot_ml_exx_label.cpp Outdated
Comment thread source/source_estate/module_pot/pot_ml_exx.cpp
Comment thread source/source_pw/module_ofdft/kedf_ml.cpp
Comment thread source/source_pw/module_ofdft/ml_base.cpp
@mohanchen mohanchen requested a review from sunliang98 June 4, 2026 03:35
Comment thread source/source_pw/module_ofdft/kedf_ml.cpp Outdated
Comment thread source/source_pw/module_ofdft/ml_base.cpp
abacus_fixer added 2 commits June 4, 2026 15:02
@mohanchen mohanchen merged commit 1919027 into deepmodeling:develop Jun 4, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Refactor Refactor ABACUS codes The Absolute Zero Reduce the "entropy" of the code to 0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants