Skip to content

Commit 6d63ea3

Browse files
committed
fixed missing -O3 in linux build script which caused slow computations
1 parent 3bbe17c commit 6d63ea3

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

linux-build-mex.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,6 @@ LDFLAGS="-L$FFTWDIR/build/threads/.libs -L$FFTWDIR/build/.libs"
178178
CPPFLAGS="-I$FFTWDIR/api"
179179
CC="$GCCINSTALLDIR/bin/gcc-$GCCVERSION" "$NFFTDIR/configure" --enable-all $OMPFLAG --with-octave="$OCTAVEDIR" --with-gcc-arch="$GCCARCH" --disable-static --enable-shared
180180
make
181-
if [ $OMPYN = 1 ]; then
182-
OCTLIBDIR=`octave-config --print OCTLIBDIR`
183-
cd matlab
184-
for SUBDIR in nfft nfsft nfsoft nnfft fastsum nfct nfst fpt
185-
do
186-
cd "$SUBDIR"
187-
"$GCCINSTALLDIR/bin/gcc-$GCCVERSION" -shared -fPIC -DPIC .libs/lib"$SUBDIR"_la-"$SUBDIR"mex.o -Wl,--whole-archive ../../.libs/libnfft3_matlab.a ../../matlab/.libs/libmatlab.a $GCCINSTALLDIR/lib64/libgomp.a -Wl,--no-whole-archive -L$OCTLIBDIR -L/$OCTAVEDIR/lib -lfftw3_threads -lfftw3 -lpthread -lm -loctinterp -loctave -Wl,-soname -Wl,lib"$SUBDIR".mex -o .libs/lib"$SUBDIR".mex
188-
cd ..
189-
done
190-
cd "$NFFTBUILDDIR"
191-
fi
192181
make check
193182

194183
NFFTVERSION=$( grep 'Version: ' nfft3.pc | cut -c10-)
@@ -233,7 +222,7 @@ if [ -n "$MATLABDIR" ]; then
233222
for SUBDIR in nfft nfsft nfsoft nnfft fastsum nfct nfst fpt
234223
do
235224
cd "$SUBDIR"
236-
"$GCCINSTALLDIR/bin/gcc-$GCCVERSION" -shared -fPIC -DPIC .libs/lib"$SUBDIR"_la-"$SUBDIR"mex.o -Wl,--whole-archive ../../.libs/libnfft3_matlab.a ../../matlab/.libs/libmatlab.a $GCCINSTALLDIR/lib64/libgomp.a -Wl,--no-whole-archive -L$MATLABDIR/bin/glnxa64 -L$FFTWDIR/build/threads/.libs -L$FFTWDIR/build/.libs -l:libmwfftw3.so.3 -lm -lmx -lmex -lmat -Wl,-soname -Wl,lib$SUBDIR.mexa64 -o .libs/lib$SUBDIR.mexa64
225+
"$GCCINSTALLDIR/bin/gcc-$GCCVERSION" -shared -fPIC -DPIC .libs/lib"$SUBDIR"_la-"$SUBDIR"mex.o -Wl,--whole-archive ../../.libs/libnfft3_matlab.a ../../matlab/.libs/libmatlab.a $GCCINSTALLDIR/lib64/libgomp.a -Wl,--no-whole-archive -L$MATLABDIR/bin/glnxa64 -l:libmwfftw3.so.3 -lm -lmx -lmex -lmat -O3 -malign-double -march="$GCCARCH" -Wl,-soname -Wl,lib$SUBDIR.mexa64 -o .libs/lib$SUBDIR.mexa64
237226
cd ..
238227
done
239228
cd "$NFFTBUILDDIR"

0 commit comments

Comments
 (0)