Skip to content

Commit 3a0c525

Browse files
committed
change the fft makefile
1 parent 18592ce commit 3a0c525

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

source/module_basis/module_pw/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ list(APPEND objects
2525
pw_init.cpp
2626
pw_transform.cpp
2727
pw_transform_k.cpp
28-
module_fft/fft_base.cpp
2928
module_fft/fft_bundle.cpp
3029
module_fft/fft_cpu.cpp
3130
${FFT_SRC}
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#include "fft_base.h"
22
namespace ModulePW
33
{
4-
template FFT_BASE<float>::FFT_BASE();
5-
template FFT_BASE<double>::FFT_BASE();
6-
template FFT_BASE<float>::~FFT_BASE();
7-
template FFT_BASE<double>::~FFT_BASE();
4+
85
}

source/module_basis/module_pw/module_fft/fft_base.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,10 @@ class FFT_BASE
165165
int ny=0;
166166
int nz=0;
167167
};
168+
169+
template FFT_BASE<float>::FFT_BASE();
170+
template FFT_BASE<double>::FFT_BASE();
171+
template FFT_BASE<float>::~FFT_BASE();
172+
template FFT_BASE<double>::~FFT_BASE();
168173
}
169174
#endif // FFT_BASE_H

source/module_basis/module_pw/module_fft/fft_cpu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class FFT_CPU : public FFT_BASE<FPTYPE>
4343
int nproc_in,
4444
bool gamma_only_in,
4545
bool xprime_in = true) override;
46+
4647
__attribute__((weak))
4748
void setupFFT() override;
4849

source/module_basis/module_pw/test/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Please set
33
# e.g. make CXX=mpiicpc or make CXX=icpc
44
#======================================================================
5-
CXX = mpiicpx
5+
CXX = mpiicpc
66
# mpiicpc: compile intel parallel version
77
# icpc: compile intel sequential version
88
# mpicxx: compile gnu parallel version
@@ -94,7 +94,7 @@ endif
9494
##==========================
9595
## GTEST
9696
##==========================
97-
GTESTOPTS = -I${GTEST_DIR}/include -L${GTEST_DIR}/lib -lgtest -lpthread
97+
GTESTOPTS = -I${GTEST_DIR}/include -L${GTEST_DIR}/lib -lgtest -lpthread -w
9898

9999

100100

@@ -106,6 +106,7 @@ VPATH=../../../module_base\
106106
../../../module_base/module_container/ATen/core\
107107
../../../module_base/module_container/ATen\
108108
../../../module_parameter\
109+
../module_fft\
109110
../\
110111

111112
MATH_OBJS0=matrix.o\
@@ -127,9 +128,10 @@ memory.o\
127128
memory_op.o\
128129
depend_mock.o\
129130
parameter.o\
130-
fft_base.o\
131-
fft_bundle.o\
132131
fft_cpu.o\
132+
fft_cpu_float.o\
133+
fft_bundle.o\
134+
133135

134136

135137
OTHER_OBJS0=

0 commit comments

Comments
 (0)