Skip to content

Commit 6de8e35

Browse files
authored
Docs: fix default value for ks_solver (#7011)
* Update default value for ks_solver * Update default value for ks_solver * Update default value for ks_solver * Update default value for ks_solver
1 parent 6e8322d commit 6de8e35

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

docs/parameters.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ parameters:
493493
* cg: The conjugate-gradient (CG) method.
494494
* bpcg: The BPCG method, which is a block-parallel Conjugate Gradient (CG) method, typically exhibits higher acceleration in a GPU environment.
495495
* dav: The Davidson algorithm.
496-
* dav_subspace: The Davidson algorithm without orthogonalization operation, this method is the most recommended for efficiency. pw_diag_ndim can be set to 2 for this method.
496+
* dav_subspace: The Davidson algorithm without orthogonalization operation, this method is the most recommended for efficiency. `pw_diag_ndim` can be set to 2 for this method.
497497
498498
For numerical atomic orbitals basis,
499499
@@ -502,14 +502,14 @@ parameters:
502502
* scalapack_gvx: Use Scalapack to diagonalize the Hamiltonian.
503503
* cusolver: Use CUSOLVER to diagonalize the Hamiltonian, at least one GPU is needed.
504504
* cusolvermp: Use CUSOLVER to diagonalize the Hamiltonian, supporting multi-GPU devices. Note that you should set the number of MPI processes equal to the number of GPUs.
505-
* elpa: The ELPA solver supports both CPU and GPU. By setting the device to GPU, you can launch the ELPA solver with GPU acceleration (provided that you have installed a GPU-supported version of ELPA, which requires you to manually compile and install ELPA, and the ABACUS should be compiled with -DUSE_ELPA=ON and -DUSE_CUDA=ON). The ELPA solver also supports multi-GPU acceleration.
505+
* elpa: The ELPA solver supports both CPU and GPU. By setting the `device` to GPU, you can launch the ELPA solver with GPU acceleration (provided that you have installed a GPU-supported version of ELPA, which requires you to manually compile and install ELPA, and the ABACUS should be compiled with -DUSE_ELPA=ON and -DUSE_CUDA=ON). The ELPA solver also supports multi-GPU acceleration.
506506
507-
If you set ks_solver=genelpa for basis_type=pw, the program will stop with an error message:
507+
If you set ks_solver=`genelpa` for basis_type=`pw`, the program will stop with an error message:
508508
509509
``text genelpa can not be used with plane wave basis. ``
510510
511511
Then the user has to correct the input file and restart the calculation.
512-
default_value: ""
512+
default_value: "\n - PW basis: cg.\n - LCAO basis:\n - genelpa (if compiling option `USE_ELPA` has been set)\n - lapack (if compiling option `ENABLE_MPI` has not been set)\n - scalapack_gvx (if compiling option `USE_ELPA` has not been set and compiling option `ENABLE_MPI` has been set)\n - cusolver (if compiling option `USE_CUDA` has been set)"
513513
unit: ""
514514
availability: ""
515515
- name: nbands
@@ -942,7 +942,7 @@ parameters:
942942
Only useful when you use ks_solver = cg/dav/dav_subspace/bpcg. It indicates the maximal iteration number for cg/david/dav_subspace/bpcg method.
943943
default_value: "50"
944944
unit: ""
945-
availability: "basis_type==pw, ks_solver== cg/dav/dav_subspace/bpcg"
945+
availability: "basis_type==pw, ks_solver==cg/dav/dav_subspace/bpcg"
946946
- name: pw_diag_ndim
947947
category: Plane wave related variables
948948
type: Integer

source/source_io/module_parameter/read_input_item_elec_stru.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For plane-wave basis,
5555
* cg: The conjugate-gradient (CG) method.
5656
* bpcg: The BPCG method, which is a block-parallel Conjugate Gradient (CG) method, typically exhibits higher acceleration in a GPU environment.
5757
* dav: The Davidson algorithm.
58-
* dav_subspace: The Davidson algorithm without orthogonalization operation, this method is the most recommended for efficiency. pw_diag_ndim can be set to 2 for this method.
58+
* dav_subspace: The Davidson algorithm without orthogonalization operation, this method is the most recommended for efficiency. `pw_diag_ndim` can be set to 2 for this method.
5959
6060
For numerical atomic orbitals basis,
6161
@@ -64,14 +64,20 @@ For numerical atomic orbitals basis,
6464
* scalapack_gvx: Use Scalapack to diagonalize the Hamiltonian.
6565
* cusolver: Use CUSOLVER to diagonalize the Hamiltonian, at least one GPU is needed.
6666
* cusolvermp: Use CUSOLVER to diagonalize the Hamiltonian, supporting multi-GPU devices. Note that you should set the number of MPI processes equal to the number of GPUs.
67-
* elpa: The ELPA solver supports both CPU and GPU. By setting the device to GPU, you can launch the ELPA solver with GPU acceleration (provided that you have installed a GPU-supported version of ELPA, which requires you to manually compile and install ELPA, and the ABACUS should be compiled with -DUSE_ELPA=ON and -DUSE_CUDA=ON). The ELPA solver also supports multi-GPU acceleration.
67+
* elpa: The ELPA solver supports both CPU and GPU. By setting the `device` to GPU, you can launch the ELPA solver with GPU acceleration (provided that you have installed a GPU-supported version of ELPA, which requires you to manually compile and install ELPA, and the ABACUS should be compiled with -DUSE_ELPA=ON and -DUSE_CUDA=ON). The ELPA solver also supports multi-GPU acceleration.
6868
69-
If you set ks_solver=genelpa for basis_type=pw, the program will stop with an error message:
69+
If you set ks_solver=`genelpa` for basis_type=`pw`, the program will stop with an error message:
7070
7171
``text genelpa can not be used with plane wave basis. ``
7272
7373
Then the user has to correct the input file and restart the calculation.)";
74-
item.default_value = "";
74+
item.default_value = R"(
75+
- PW basis: cg.
76+
- LCAO basis:
77+
- genelpa (if compiling option `USE_ELPA` has been set)
78+
- lapack (if compiling option `ENABLE_MPI` has not been set)
79+
- scalapack_gvx (if compiling option `USE_ELPA` has not been set and compiling option `ENABLE_MPI` has been set)
80+
- cusolver (if compiling option `USE_CUDA` has been set))";
7581
item.unit = "";
7682
item.availability = "";
7783
read_sync_string(input.ks_solver);

0 commit comments

Comments
 (0)