Permalink
Browse files
Mods to makefile to get to compile 3dECM
- Loading branch information...
Showing
with
10 additions
and
6 deletions.
-
+1
−0
.gitignore
-
+5
−3
src/3dECM.c
-
+4
−3
src/Makefile.linux_openmp_64
|
|
@@ -32,3 +32,4 @@ ___* |
|
|
|
|
|
# Octave workspace
|
|
|
octave-workspace
|
|
|
+/Debug/
|
|
|
@@ -160,8 +160,10 @@ static long total_mem = 0; |
|
|
\
|
|
|
if( eigen_vec != NULL ) \
|
|
|
{ \
|
|
|
- free(eigen_vec) ; \
|
|
|
- eigen_vec = NULL ; \
|
|
|
+ free(eigen_vec[0]) ; \
|
|
|
+ free(eigen_vec[1]) ; \
|
|
|
+ eigen_vec[0] = NULL ; \
|
|
|
+ eigen_vec[1] = NULL ; \
|
|
|
} \
|
|
|
}
|
|
|
|
|
|
@@ -184,7 +186,7 @@ static void vstep_print(void) |
|
|
}
|
|
|
|
|
|
/*----------------------------------------------------------------*/
|
|
|
-/**** Include these hesre for potential optimization for OpenMP ****/
|
|
|
+/**** Include these here for potential optimization for OpenMP ****/
|
|
|
/*----------------------------------------------------------------*/
|
|
|
/*! Pearson correlation of x[] and y[] (x and y are NOT modified.
|
|
|
And we know ahead of time that the time series have 0 mean
|
|
|
|
|
|
@@ -6,7 +6,8 @@ |
|
|
USE_ZLIB = -DHAVE_ZLIB
|
|
|
LZLIB = -lz
|
|
|
USE_GIFTI = -DHAVE_GIFTI
|
|
|
-LGIFTI = /usr/lib64/libexpat.a
|
|
|
+#LGIFTI = /usr/lib64/libexpat.a
|
|
|
+LGIFTI = -lexpat
|
|
|
|
|
|
# ------------------------------
|
|
|
# python from C (off for now)
|
|
|
@@ -37,7 +38,7 @@ else |
|
|
endif
|
|
|
|
|
|
# in case user wants to override with system dynamic libs
|
|
|
-# XLIBS = -lXm -lXt
|
|
|
+XLIBS = -lXm -lXt
|
|
|
# ----------------------------------------------------------------------
|
|
|
|
|
|
CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
|
|
|
@@ -46,7 +47,7 @@ CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE $(CPROF) -DDONT_USE_XTDEST |
|
|
CC = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
|
|
|
CCVOL = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
|
|
|
CCFAST = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
|
|
|
-CCOLD = /usr/bin/gcc -V 34 -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
|
|
|
+CCOLD = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
|
|
|
|
|
|
# The following line includes compiling for the SSE operations.
|
|
|
# However, I found that it actually makes things worse in some test code.
|
|
|
|
0 comments on commit
502af9a