Skip to content

Commit 5926001

Browse files
authored
Move some output information out of ESolver_KS_PW, not an easy task, actually. (deepmodeling#6541)
* update small places in charge_mixing_residual.cpp * update charge_mixing_preconditioner * add timers and remove some PARAM.inp.nspin * fix problems * add timers * small fix * fix a potential memory leak * fix bug * add ctrl_output_pw files but cannot run now * add some interfaces in ctrl_output_pw * keep fixing bugs * successfully compile the codes * finally I understand Devicegit add ../source/source_base/module_device/device.h ../source/source_io/ctrl_output_pw.cpp ../source/source_io/ctrl_output_pw.h! * update function variables * one step further * move on * update codes, done! * fix bug
1 parent 240da39 commit 5926001

File tree

7 files changed

+624
-352
lines changed

7 files changed

+624
-352
lines changed

source/Makefile.Objects

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ OBJS_IO=input_conv.o\
580580
output_mat_sparse.o\
581581
ctrl_output_lcao.o\
582582
ctrl_output_fp.o\
583+
ctrl_output_pw.o\
583584
para_json.o\
584585
abacusjson.o\
585586
general_info.o\

source/source_base/module_device/device.h

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
namespace base_device
1212
{
1313

14-
// struct CPU;
15-
// struct GPU;
16-
17-
// enum AbacusDevice_t
18-
// {
19-
// UnKnown,
20-
// CpuDevice,
21-
// GpuDevice
22-
// };
23-
2414
template <typename Device>
2515
base_device::AbacusDevice_t get_device_type(const Device* dev);
2616

@@ -73,7 +63,6 @@ int get_node_rank_with_mpi_shared(const MPI_Comm mpi_comm = MPI_COMM_WORLD);
7363
int stringCmp(const void* a, const void* b);
7464

7565
#ifdef __CUDA
76-
7766
int set_device_by_rank(const MPI_Comm mpi_comm = MPI_COMM_WORLD);
7867
#endif
7968

@@ -122,4 +111,4 @@ static __inline__ __device__ double atomicAdd(double* address, double val)
122111
}
123112
#endif
124113

125-
#endif // MODULE_DEVICE_H_
114+
#endif // MODULE_DEVICE_H_

0 commit comments

Comments
 (0)