CUDA_OPTS:

	modified:   env/Eos_env
	modified:   src/Config/x86Linux64.inc
	modified:   src/Config/x86Linux64icc.inc
	modified:   src/Config/x86Mac64.inc

diff --git a/env/Eos_env b/env/Eos_env
index 25fd8b0..d5f1da0 100755 (executable)
--- a/env/Eos_env
+++ b/env/Eos_env
@@ -1,16 +1,22 @@
 #!/usr/local/bin/bash
 # Set Eos Home Directory
 export EOS_HOME=$HOME/Eos
-export EOS_MIRROR_SITE=/work15/Eos07/Eos
+export EOS_MIRROR_SITE=$HOME/EosMirror
 export EOS_GIT_USER=$USER
 
-P4=`uname -p | grep "Intel"`
+
+###### HOSTYPE #####
+# For Intel
+P4=`uname -p  | grep "Intel"`
+
+# For ManyCPU/PHI
 MIC=`uname -p | grep "k1om"`
 if [ ! -z "$MIC" ] 
 then
        HOSTTYPE=`uname -m | grep "k1om"`
 fi
 
+
 if [ "$HOSTTYPE" = "i486" ]
 then
        if [ -z "$P4" ]
@@ -23,12 +29,14 @@ then
                export HOSTTYPE="i386"
        fi
 fi
-CELL=`uname -p | grep "Cell"`
+
+CELL=`uname -p   | grep "Cell"`
 CYGWIN=`uname -s | grep "CYGWIN"`
-LINUX=`uname -s | grep "Linux"`
-MAC=`uname -s | grep "Darwin"`
+LINUX=`uname -s  | grep "Linux"`
+MAC=`uname -s    | grep "Darwin"`
 
 MACHINE=`uname -m`
+
 # Set Eos host type
 case $HOSTTYPE in
        "alpha")
@@ -166,7 +174,9 @@ case $HOSTTYPE in
                fi
                ;;
 esac
-# Set Display2 Home
+
+
+### Set Display2 Home
 export DISPLAY2_HOME=$EOS_HOME/bin/wish
 
 # Set PATH
@@ -216,6 +226,9 @@ CK_PVM_ROOT_BIN=$(echo $PATH | grep $PVM_ROOT_BIN)
 if [ -z "$CK_PVM_ROOT_BIN" -a -d $PVM_ROOT_BIN ]; then
        export PATH=$PATH:$PVM_ROOT_BIN
 fi
+
+##### LD_LIBRARY_PATH ######
+### Intel Complier
 if [ -d /opt/intel/compiler70/ia32/lib ]; then
        if [ ! -z "$LD_LIBRARY_PATH" ]; then
                export LD_LIBRARY_PATH=/opt/intel/compiler70/ia32/lib:$LD_LIBRARY_PATH
@@ -223,6 +236,7 @@ if [ -d /opt/intel/compiler70/ia32/lib ]; then
                export LD_LIBRARY_PATH=/opt/intel/compiler70/ia32/lib
        fi
 fi
+### Eos
 if [ -d $EOS_HOME/util/$EOS_HOSTDIR/lib ]; then
        if [ ! -z "$LD_LIBRARY_PATH" ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/util/$EOS_HOSTDIR/lib:$LD_LIBRARY_PATH
@@ -230,6 +244,7 @@ if [ -d $EOS_HOME/util/$EOS_HOSTDIR/lib ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/util/$EOS_HOSTDIR/lib
        fi
 fi
+### Vtk
 if [ -d $EOS_HOME/util/$EOS_HOSTDIR/lib/vtk ]; then
        if [ ! -z "$LD_LIBRARY_PATH" ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/util/$EOS_HOSTDIR/lib/vtk:$LD_LIBRARY_PATH
@@ -237,6 +252,7 @@ if [ -d $EOS_HOME/util/$EOS_HOSTDIR/lib/vtk ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/util/$EOS_HOSTDIR/lib/vtk
        fi
 fi
+### Eos util
 if [ -d $EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib ]; then
        if [ ! -z "$LD_LIBRARY_PATH" ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib:$LD_LIBRARY_PATH
@@ -244,6 +260,7 @@ if [ -d $EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib
        fi
 fi
+### Vtk
 if [ -d $EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk ]; then
        if [ ! -z "$LD_LIBRARY_PATH" ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk:$LD_LIBRARY_PATH
@@ -253,6 +270,7 @@ if [ -d $EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk ]; then
 fi
 #echo ".Eos_env(1):$LD_LIBRARY_PATH"
 
+##### CUDA #####
 if [ -z "$CUDA_ROOT" ];
 then
        CUDA_ROOT=$EOS_HOME/util/$EOS_HOSTDIR/cuda
@@ -297,6 +315,7 @@ else
 fi
 export CUDA_OPTS
 
+##### ATI
 #echo ".Eos_env(2):$LD_LIBRARY_PATH"
 #
 # ATI Stream SDK
@@ -326,6 +345,7 @@ else
        fi
 fi
 
+#### LIBGFORTRAN
 #echo ".Eos_env(3):$LD_LIBRARY_PATH"
 #
 # libgfortran
@@ -399,6 +419,7 @@ fi
 # For Tcl/Tk Library (Display2/ctfDisplay etc.)
 export TCL_LIBRARY=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/tcl8.4
 
+#### DLL
 # For Dynamic Library
 export DYLD_FALLBACK_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib:$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk:$DYLD_FALLBACK_LIBRARY_PATH:/usr/lib 
 export LD_LIBRARY_PATH=/opt/intel/compiler70/ia32/lib:$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib:$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk:$LD_LIBRARY_PATH:/usr/lib

diff --git a/src/Config/x86Linux64.inc b/src/Config/x86Linux64.inc
index 59a6970..eb71c14 100755 (executable)
--- a/src/Config/x86Linux64.inc
+++ b/src/Config/x86Linux64.inc
@@ -1,5 +1,5 @@
 OSTYPE  = X86LINUX64
-ARCHTYPE = -DII -DFFTW -D$(OSTYPE)
+ARCHTYPE = -DII -DFFTW -D$(OSTYPE) $(CUDA_OPTS)
 
 SHELL   = /bin/bash
 

diff --git a/src/Config/x86Linux64icc.inc b/src/Config/x86Linux64icc.inc
index ba43c8b..d4c8054 100755 (executable)
--- a/src/Config/x86Linux64icc.inc
+++ b/src/Config/x86Linux64icc.inc
@@ -1,5 +1,5 @@
 OSTYPE  = X86LINUX64ICC
-ARCHTYPE = -DII -DFFTW -D$(OSTYPE)
+ARCHTYPE = -DII -DFFTW -D$(OSTYPE) $(CUDA_OPTS)
 
 SHELL   = /bin/bash
 

diff --git a/src/Config/x86Mac64.inc b/src/Config/x86Mac64.inc
index cf8b3bb..53bcd3f 100755 (executable)
--- a/src/Config/x86Mac64.inc
+++ b/src/Config/x86Mac64.inc
@@ -1,5 +1,5 @@
 OSTYPE  = X86MAC64
-ARCHTYPE = -DII -DFFTW -D$(OSTYPE)
+ARCHTYPE = -DII -DFFTW -D$(OSTYPE) $(CUDA_OPTS)
 
 SHELL   = /bin/bash