Skip to content

Commit 8d73d7e

Browse files
committed
modify the position of the new fft
1 parent 75e42ba commit 8d73d7e

File tree

10 files changed

+9
-288
lines changed

10 files changed

+9
-288
lines changed

source/Makefile.Objects

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ VPATH=./src_global:\
2525
./module_base/module_container/ATen/ops:\
2626
./module_base/module_device:\
2727
./module_base/module_mixing:\
28+
./moudle_base/module_fft:\
2829
./module_md:\
2930
./module_basis/module_pw:\
3031
./module_esolver:\
@@ -166,7 +167,8 @@ OBJS_BASE=abfs-vector3_order.o\
166167
broyden_mixing.o\
167168
memory_op.o\
168169
device.o\
169-
170+
fft_base.o\
171+
fft_temp.o\
170172

171173
OBJS_CELL=atom_pseudo.o\
172174
atom_spec.o\
@@ -411,8 +413,6 @@ OBJS_PSI_INITIALIZER=psi_initializer.o\
411413
psi_initializer_nao_random.o\
412414

413415
OBJS_PW=fft.o\
414-
fft_base.o\
415-
fft_temp.o\
416416
pw_basis.o\
417417
pw_basis_k.o\
418418
pw_basis_sup.o\

source/module_base/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ add_library(
5858
module_mixing/plain_mixing.cpp
5959
module_mixing/pulay_mixing.cpp
6060
module_mixing/broyden_mixing.cpp
61+
module_fft/fft_base.cpp
62+
module_fft/fft_temp.cpp
6163
${LIBM_SRC}
6264
)
6365

source/module_basis/module_pw/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
list(APPEND objects
22
fft.cpp
3-
fft_base.cpp
4-
fft_temp.cpp
53
pw_basis.cpp
64
pw_basis_k.cpp
75
pw_basis_sup.cpp

source/module_basis/module_pw/fft_temp.cpp

Lines changed: 0 additions & 280 deletions
This file was deleted.

source/module_basis/module_pw/pw_basis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "module_base/vector3.h"
77
#include <complex>
88
#include "fft.h"
9-
#include "fft_temp.h"
9+
#include "module_base/module_fft/fft_temp.h"
1010
#include <cstring>
1111
#ifdef __MPI
1212
#include "mpi.h"

source/module_basis/module_pw/pw_transform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "fft.h"
2-
#include "fft_temp.h"
2+
#include "module_base/module_fft/fft_temp.h"
33
#include <complex>
44
#include "pw_basis.h"
55
#include <cassert>

source/module_basis/module_pw/test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ AddTest(
44
LIBS parameter ${math_libs} planewave device
55
SOURCES ../../../module_base/matrix.cpp ../../../module_base/complexmatrix.cpp ../../../module_base/matrix3.cpp ../../../module_base/tool_quit.cpp
66
../../../module_base/mymath.cpp ../../../module_base/timer.cpp ../../../module_base/memory.cpp ../../../module_base/blas_connector.cpp
7-
../../../module_base/libm/branred.cpp ../../../module_base/libm/sincos.cpp
7+
../../../module_base/libm/branred.cpp ../../../module_base/libm/sincos.cpp
8+
../../../module_base/module_fft/fft_base.cpp ../../../module_base/module_fft/fft_temp.cpp
89
# ../../../module_psi/kernels/psi_memory_op.cpp
910
../../../module_base/module_device/memory_op.cpp
1011
depend_mock.cpp pw_test.cpp test1-1-1.cpp test1-1-2.cpp test1-2.cpp test1-3.cpp test1-4.cpp test1-5.cpp

0 commit comments

Comments
 (0)