Merge branch 'develop' of https://github.com/deepmodeling/abacus-develop into develop

Author: lyb9812

source/Makefile.Objects

@@ -582,6 +582,7 @@ OBJS_IO=input_conv.o\
     output_mat_sparse.o\
     ctrl_output_lcao.o\
     ctrl_output_fp.o\
+    ctrl_output_pw.o\
     para_json.o\
     abacusjson.o\
     general_info.o\

source/source_base/module_device/device.h

@@ -11,16 +11,6 @@
 namespace base_device
 {
 
-// struct CPU;
-// struct GPU;
-
-// enum AbacusDevice_t
-// {
-//     UnKnown,
-//     CpuDevice,
-//     GpuDevice
-// };
-
 template <typename Device>
 base_device::AbacusDevice_t get_device_type(const Device* dev);
 
@@ -73,7 +63,6 @@ int get_node_rank_with_mpi_shared(const MPI_Comm mpi_comm = MPI_COMM_WORLD);
 int stringCmp(const void* a, const void* b);
 
 #ifdef __CUDA
-
 int set_device_by_rank(const MPI_Comm mpi_comm = MPI_COMM_WORLD);
 #endif
 
@@ -122,4 +111,4 @@ static __inline__ __device__ double atomicAdd(double* address, double val)
 }
 #endif
 
-#endif // MODULE_DEVICE_H_
+#endif // MODULE_DEVICE_H_