>> Change Makefile for rebuilding

	modified:   src/Makefile
	modified:   src/Tools/Config/Define.inc
	typechange: src/Tools/Makefile

>> Change mrcImageFFT
	modified:   src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c

diff --git a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.a b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.a
index cb79657..371316b 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.a and b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.a differ

diff --git a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.so b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.so
index f63eb6f..a8f9162 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.so and b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libEosObjects.so differ

diff --git a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libmrcImage.a b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libmrcImage.a
index bf6db0a..51ff087 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libmrcImage.a and b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/shared/lmrcImageFFT.sharedo b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/shared/lmrcImageFFT.sharedo
index 933e29d..41fe215 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/shared/lmrcImageFFT.sharedo and b/hostdepend/X86LINUX64ICC/lib/X86LINUX64ICC/shared/lmrcImageFFT.sharedo differ

diff --git a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.a b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.a
index bf6db0a..51ff087 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.a and b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.debug.a b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.debug.a
index 5d62ff1..5142efb 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.debug.a and b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.debug.a differ

diff --git a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/lmrcImageFFT.sharedo b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/lmrcImageFFT.sharedo
index 933e29d..41fe215 100644 (file)
Binary files a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/lmrcImageFFT.sharedo and b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/lmrcImageFFT.sharedo differ

diff --git a/hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64ICC/mrcImageFFT b/hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64ICC/mrcImageFFT
index 949ecdd..971d1d4 100755 (executable)
Binary files a/hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64ICC/mrcImageFFT and b/hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64ICC/mrcImageFFT differ

diff --git a/src/Makefile b/src/Makefile
index 3a4138f..e936fab 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,12 +1,12 @@
-
+# Top Level Makefile
 
 all:
        cd Objects; make
        cd Tools; make
 
 check:
-       cp -f Config/Template/ObjectsHomeTemplate.dir/Makefile Objects/Makefile ; cd Objects; make check
-       cp -f Config/Template/ToolsHomeTemplate.dir/Makefile   Tools/Makefile   ; cd Tools  ; make check
+       rm -f Objects/Makefile; cp -f Config/Template/ObjectsHomeTemplate.Dir/Makefile Objects/Makefile ; cd Objects; make check
+       rm -f Tools/Makefile  ; cp -f Config/Template/ToolsHomeTemplate.Dir/Makefile   Tools/Makefile   ; cd Tools  ; make check
 
 depend:
        cd Objects; make depend 

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c b/src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
index 97efba2..6ab7676 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageFFT.c
@@ -17,9 +17,11 @@ static char __sccs_id[] = "%Z%lmrcImageFFT ver%I%; Date:%D% %Z%";
 #include "Memory.h"
 #include "eosPThread.h"
 #include "../inc/mrcImage.h"
+#include <cuda.h>
 //#undef FFTW
 #ifdef FFTW
-#include "fftw3.h"
+//#include "fftw3.h"
+#include <cufftw.h>
 static unsigned int flagFFTW=FFTW_ESTIMATE;
 void
 lmrcImageFFTWFlagSet(unsigned int flag)

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index e344cf2..0f47ef5 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -89,3 +89,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
deleted file mode 120000 (symlink)
index 4d5f4f4c5313e6893993bc2df5ea53a157411cf9..0000000000000000000000000000000000000000
--- a/src/Tools/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-/home/people/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..ad841104b1b4aa83ce554496adb2d2476544f988
--- /dev/null
+++ b/src/Tools/Makefile
@@ -0,0 +1,5 @@
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+include Config/Target.inc

diff --git a/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc b/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
index 72bb167..5865e58 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
+++ b/src/Tools/mrcImage/mrcImageFFT/Config/Define.inc
@@ -1,4 +1,4 @@
 OBJECTNAME = mrcImageFFT
-EXTRA_LIB  =
+EXTRA_LIB  = -L${CUDA_ROOT}/lib64 -lcudart -lcufftw
 EXTRA_CCOPTS =
 EXTRA_INC =

diff --git a/src/Tools/mrcImage/mrcImageFFT/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageFFT/Config/OptionControlFile
index c13c252..3ba956a 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageFFT/Config/OptionControlFile
@@ -2,6 +2,6 @@
 # FileFormat
 "-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL"
 "-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
-"-cuda","-cuda","UseCUDA","Optional","0"
+"-cuda","-cuda","UseCUDA","Optional","1","1","cudaDeviceID","Integer","0"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/mrcImage/mrcImageFFT/Makefile b/src/Tools/mrcImage/mrcImageFFT/Makefile
deleted file mode 100755 (executable)
index 4dbb018acae5475bce203b3db2365124accfa24b..0000000000000000000000000000000000000000
--- a/src/Tools/mrcImage/mrcImageFFT/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-include ../../../Config/Define.inc
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-
-all:
-       cd src; make all; cd ..
-
-install:
-       cd src; make install; cd ..
-
-
-putSF:
-       if [ -f private ] ; \
-       then \
-               echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
-       else \
-               cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
-       fi
-
-put:
-       cd src; make put; cd ..
-
-clean:
-       cd src; make clean; cd ..
-
-depend:
-       cd src; make depend; cd ..
-
-check:
-       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
-               echo making directory; \
-               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
-       fi
-       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
-       @$(RM) src/Makefile
-       @echo "New src/Makefile" 
-       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-       @cd src; touch $(OSTYPE)/.Depend; make depend
-
-cvsupdate::
-       cvs -d $(EOS_CVSROOT) update -d 
-
-cvscommit::
-       cvs -d $(EOS_CVSROOT) commit
-
-backup:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-
-backup-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-       
-distribute:
-       cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-       
-distribute-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-
-eosintroduce:
-       ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
-
-include Config/Target.inc

diff --git a/src/Tools/mrcImage/mrcImageFFT/Makefile b/src/Tools/mrcImage/mrcImageFFT/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..537735e6f10200cd5c886af6775498a31bbc041e
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageFFT/Makefile
@@ -0,0 +1 @@
+/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/mrcImage/mrcImageFFT/inc/mrcImageFFT.h b/src/Tools/mrcImage/mrcImageFFT/inc/mrcImageFFT.h
index 7ee6e11..1d19a7f 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/inc/mrcImageFFT.h
+++ b/src/Tools/mrcImage/mrcImageFFT/inc/mrcImageFFT.h
@@ -21,8 +21,9 @@ typedef struct mrcImageFFTInfo {
     char* Out;
     FILE* fptOut;
     
-    long cuda;
-
+    long flagcudaDeviceID;
+    long cudaDeviceID;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/argCheck.c b/src/Tools/mrcImage/mrcImageFFT/src/argCheck.c
index 516b9d8..20fec4c 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageFFT/src/argCheck.c
@@ -12,7 +12,7 @@
 void
 argCheck(mrcImageFFTInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
     FILE* fpt;
     
@@ -51,8 +51,10 @@ argCheck(mrcImageFFTInfo* info, int argc, char* argv[])
                     SBREAK;
                 }
                 SCASE("cuda") {
-                    if(i+0<argc) {
-                        info->cuda++;
+                    if(i+1<argc) {
+                        info->cudaDeviceID = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagcudaDeviceID++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/init.c b/src/Tools/mrcImage/mrcImageFFT/src/init.c
index 6fc3110..9387df9 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/src/init.c
+++ b/src/Tools/mrcImage/mrcImageFFT/src/init.c
@@ -14,7 +14,7 @@ init0(mrcImageFFTInfo* info)
 {
     info->fptIn = NULL;    info->flagIn = 0;
     info->fptOut = NULL;    info->flagOut = 0;
-    info->cuda=0;
+    info->cudaDeviceID = 0;    info->flagcudaDeviceID = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -42,6 +42,9 @@ init1(mrcImageFFTInfo* info)
         info->fptOut = fileOpen(info->Out, "w");
     }
     
+    if(info->flagcudaDeviceID) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/mrcImageFFT.pane b/src/Tools/mrcImage/mrcImageFFT/src/mrcImageFFT.pane
index d48c8c3..5bd5e0e 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/src/mrcImageFFT.pane
+++ b/src/Tools/mrcImage/mrcImageFFT/src/mrcImageFFT.pane
@@ -9,7 +9,7 @@
         -Q 1 0 5.25x1+47+0 'Close'
         -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i
         -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o
-        -t 1 0 1 0 0 6x1+1+4 'cuda' 'UseCUDA' cuda
+        -i 1 0 1 0 0 -1x1+1+4.500000 0 0 0 0 0 'cudaDeviceID' 'UseCUDA' cuda
         -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c
         -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m
     -E

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/test/Makefile b/src/Tools/mrcImage/mrcImageFFT/src/test/Makefile
index 3cd5cbc..6c87cd2 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageFFT/src/test/Makefile
@@ -11,7 +11,8 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/121p.mrc -o data/121p.fft
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/testLarge.3d -o data/testLarge.3d.fft
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/testLarge.3d -o data/testLarge.3d.fft -cuda 0
        @echo "----- Calc check -----"          
 
 clean:

diff --git a/src/Tools/mrcImage/mrcImageFFT/src/usage.c b/src/Tools/mrcImage/mrcImageFFT/src/usage.c
index 50b5023..00b79bc 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFFT/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageFFT/src/usage.c
@@ -7,11 +7,11 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-cuda               ] :Optional  :UseCUDA\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile\n");
+    fprintf(stderr, "    [-cuda               cudaDeviceID        (0         ).as(Integer             ) ] :Optional  :UseCUDA\n");
+    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
+    fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();
 }
 

diff --git a/\7f b/\7f
deleted file mode 100644 (file)
index 6053481..0000000
--- a/\7f
+++ /dev/null
@@ -1,57 +0,0 @@
-have_library: checking for main() in -lGL... -------------------- no
-
-<<<<<<< HEAD
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/x86_64-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration conftest.c  -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic     -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby-static  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/local/lib/ruby/1.9.1/mkmf.rb:317: warning: Insecure world writable dir /net/fs08/workFS08 in PATH, mode 040777
-=======
-"xcrun cc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin12.0 -I. -I/Applications/Eos.app/Eos/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common   conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L/usr/lib -L/Applications/Eos.app/Eos/lib/X86MAC64 -L/Applications/Eos.app/Eos/util/X86MAC64/lib -L. -arch i386 -arch x86_64      -lruby -lGL  -lpthread -ldl -lobjc  "
-dyld: Symbol not found: __cg_TIFFClientOpen
-  Referenced from: /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-  Expected in: /Applications/Eos.app/Eos/util/X86MAC64/lib/libTIFF.dylib
- in /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-xcrun: error: unable to locate xcodebuild, please make sure the path to the Xcode folder is set correctly!
-xcrun: error: You can set the path to the Xcode folder using /usr/bin/xcode-select -switch
->>>>>>> FETCH_HEAD
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main() {return 0;}
-/* end */
-
-<<<<<<< HEAD
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/x86_64-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration conftest.c  -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic     -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby-static -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/bin/ld: cannot find -lGL
-collect2: ld はステータス 1 で終了しました
-=======
-"xcrun cc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin12.0 -I. -I/Applications/Eos.app/Eos/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common   conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L/usr/lib -L/Applications/Eos.app/Eos/lib/X86MAC64 -L/Applications/Eos.app/Eos/util/X86MAC64/lib -L. -arch i386 -arch x86_64      -lruby -lGL  -lpthread -ldl -lobjc  "
-dyld: Symbol not found: __cg_TIFFClientOpen
-  Referenced from: /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-  Expected in: /Applications/Eos.app/Eos/util/X86MAC64/lib/libTIFF.dylib
- in /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-xcrun: error: unable to locate xcodebuild, please make sure the path to the Xcode folder is set correctly!
-xcrun: error: You can set the path to the Xcode folder using /usr/bin/xcode-select -switch
->>>>>>> FETCH_HEAD
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/x86_64-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include     -O3 -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration conftest.c  -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L.  -rdynamic -Wl,-export-dynamic     -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby-static -lGL  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-/usr/bin/ld: cannot find -lGL
-collect2: ld はステータス 1 で終了しました
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { main(); return 0; }
-/* end */
-
---------------------
-

diff --git a/\7f\7f b/\7f\7f
deleted file mode 100644 (file)
index d5de8bb..0000000
--- a/\7f\7f
+++ /dev/null
@@ -1,56 +0,0 @@
-       modified:   mrcImageFractalFourierShellCorrelation.c
-       modified:   pdbListRMSDCalc.c
-#
-# Changed but not updated:
-#   (use "git add/rm <file>..." to update what will be committed)
-#   (use "git checkout -- <file>..." to discard changes in working directory)
-#
-#      deleted:    :q
-#      deleted:    Eos
-#      deleted:    bin/wish/ctfDisplay/.nfs00000000089206620000003e
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/.nfs000000000007cd3300000007
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/geogeoge
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/itami
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/kayabuki
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/konson3
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/kuma
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/miho2
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/myo
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/reoleo
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/ryuuhaku
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/takahiro
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/watanabe2009
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/yajinori
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/yamashita09
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/yoshinori
-#      deleted:    hostdepend/X86LINUX64/bin/X86LINUX64/yoshio
-#      deleted:    hostdepend/X86LINUX64/src/Objects/DataExpress/openGL/src/X86LINUX64/SDLmolvieEvent.sharedo
-#      deleted:    hostdepend/X86LINUX64/src/Objects/General/Raw/src/X86LINUX64/lib.a
-#      deleted:    hostdepend/X86LINUX64/src/Tools/Integration/StereoDisplay/src/X86LINUX64/.Depend
-#      deleted:    hostdepend/X86LINUX64/src/Tools/Test/cufft/src/X86LINUX64/cufft
-#      deleted:    hostdepend/X86LINUX64/src/Tools/admin/mallocCheck/src/X86LINUX64/.Depend
-#      deleted:    hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/X86LINUX64/.Depend
-#      deleted:    hostdepend/X86LINUX64/util/X86LINUX64/lib/.nfs00000000089a342c00000044
-#      deleted:    hostdepend/X86LINUX64/util/X86LINUX64/lib/.nfs00000000089a342e00000045
-#      deleted:    hostdepend/X86LINUX64ICC/src/Tools/Integration/StereoDisplay/src/X86LINUX64ICC/.Depend
-#      deleted:    hostdepend/X86LINUX64ICC/src/Tools/admin/mallocCheck/src/X86LINUX64ICC/.Depend
-#      deleted:    hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/X86LINUX64ICC/.Depend
-#      deleted:    include/mrcImageAutoRotationCorrelation.h
-#      deleted:    include/mrcImageAutoRotationCorrelationResultPrint.h
-#      deleted:    src/Objects/DataManip/transform/src/:q
-#      deleted:    src/Objects/DataManip/transform/src/:w
-#      deleted:    src/Tools/Config/#%2Amerge%2A#16143LXY#
-#      deleted:    src/Tools/Test/cufft/src/cufft.c
-#      deleted:    src/Tools/Test/cufft/src/cufft.cu.backup
-#      deleted:    src/Tools/mrcImage/mrcImage3DWindowing/src/mrcImage3DWindowing.c.20090604062120
-#      deleted:    src/Tools/mrcImage/mrcImageAutoRotationCorrelation3D/src/test.err
-#      deleted:    src/Tools/mrcImage/mrcImageAverage/src/.mrcImageAverage.c.swp
-#      deleted:    src/Tools/mrcImage/mrcImageFFT/src/test/test.log
-#      deleted:    "src/Tools/mrcImage/mrcImageModelCreate/src/\b"
-#      deleted:    src/Tools/mrcImage/mrcImageModelCreate/src/1mys.pdb
-#      deleted:    src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c.org
-#      deleted:    src/Tools/mrcImage/mrcImageModelCreate/src/sample.mrc
-#      deleted:    src/Tools/mrcImage/mrcInfo/src/test.mrc
-#      deleted:    src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/vectorImageNearestNeighborMethod.cc
-#      deleted:    "\177"
-#