For CUDA

	modified:   env/Eos_env

diff --git a/env/Eos_env b/env/Eos_env
index 4838253..3532077 100755 (executable)
--- a/env/Eos_env
+++ b/env/Eos_env
@@ -89,7 +89,7 @@ case $HOSTTYPE in
                export EOS_HOSTDIR=SGI
                ;;
        "i386")
-               echo $P4
+               #echo $P4
                if [ -z "$P4" ] ; then
                        if [ ! -z "$MAC" ] ; then 
                                export EOS_HOST=i386Mac
@@ -136,7 +136,7 @@ case $HOSTTYPE in
                fi
                ;;
        "x86_64")
-               echo $P4
+               #echo $P4
                if [ -z "$P4" ] ; then
                        if [ ! -z "$MAC" ] ;  then 
                                major=`sw_vers | awk '/ProductVersion/ { split($2, a, "."); print a[1] }'`
@@ -278,43 +278,61 @@ fi
 #echo ".Eos_env(1):$LD_LIBRARY_PATH"
 
 ##### CUDA #####
-if [ -z "$CUDA_ROOT" ] ; then
-       CUDA_ROOT=$EOS_HOME/util/$EOS_HOSTDIR/cuda
-       if [ -d "$CUDA_ROOT" ] ; then
-               export CUDA_ROOT
-               export PATH=$CUDA_ROOT/cudaprof/bin:$CUDA_ROOT/bin:$PATH
-               if [ ! -z "$LD_LIBRARY_PATH" ] ; then
-                       export LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$CUDA_ROOT/lib:$LD_LIBRARY_PATH
-               else
-                       export LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$CUDA_ROOT/lib
-               fi
+if [ ! -z "$CUDA_ROOT" ] ; then
+       if [ ! -d $CUDA_ROOT -a ! -L $CUDA_ROOT ]; then
+               export CUDA_ROOT= 
        fi
-       CUDA_ROOT=/usr/local/cuda
-       if [ -d "$CUDA_ROOT" ] ; then
-               export CUDA_ROOT
-               export PATH=$CUDA_ROOT/cudaprof/bin:$CUDA_ROOT/bin:$PATH
-               if [ ! -z "$LD_LIBRARY_PATH" ] ; then
-                       export LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$CUDA_ROOT/lib:$LD_LIBRARY_PATH
-               else
-                       export LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$CUDA_ROOT/lib
+fi
+if [ ! -z "$CUDA_ROOT" ] ; then
+    OIFS=$IFS
+    IFS=": "
+       #echo "LD"
+       for k in "$LD_LIBRARY_PATH" ; do
+               v=`echo $k | egrep $CUDA_ROOT`
+               #echo $v
+               if [ ! -z "$v" ] ; then
+                       #echo $v
+                       if [ -d "$v" -o -L "$v" ] ; then
+                               if [ -z "$CUDA_LD_LIBRARY_PATH" ] ; then
+                                       CUDA_LD_LIBRARY_PATH=$v
+                               else
+                                       CUDA_LD_LIBRARY_PATH=$v:$CUDA_LD_LIBRARY_PATH
+                               fi
+                               #echo $v
+                       fi
                fi
-       fi
+       done
+       #echo "PATH"
+       for k in "$PATH" ; do
+               v=`echo $k | egrep $CUDA_ROOT`
+               #echo $v
+               if [ ! -z "$v" ] ; then
+                       if [ -d "$v" -o -L "$v" ] ; then
+                               if [ -z "$CUDA_PATH" ] ; then
+                                       CUDA_PATH=$v
+                               else
+                                       CUDA_PATH=$v:$CUDA_PATH
+                               fi
+                       fi
+               fi
+       done
+    IFS=$OIFS
 else
-#    OIFS=$IFS
-#    IFS=":"
-#   IFS=: read k v << (echo "$LD_LIBRARY_PATH" | egrep "$CUDA_ROOT" )
-       k=$(echo "$LD_LIBRARY_PATH" | egrep "$CUDA_ROOT" )
-#    IFS=$OIFS
-#   read k v << (echo "$LD_LIBRARY_PATH" | egrep "$CUDA_ROOT" )
-#      echo "()k=$k"
-#      echo "v=$v"
-       if [ -z "$k" ] ; then
-               export CUDA_ROOT
-               export PATH=$CUDA_ROOT/cudaprof/bin:$CUDA_ROOT/bin:$PATH
-               if [ ! -z "$LD_LIBRARY_PATH" ] ; then
-                       export LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$LD_LIBRARY_PATH
-               else
-                       export LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64
+       CUDA_ROOT=$EOS_HOME/util/$EOS_HOSTDIR/cuda
+       if [ -d "$CUDA_ROOT" -o -L "$CUDA_ROOT" ] ; then 
+               export CUDA_ROOT=$CUDA_ROOT
+               export CUDA_PATH=$CUDA_ROOT/cudaprof/bin:$CUDA_ROOT/bin:$PATH
+               export CUDA_LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$CUDA_ROOT/lib
+       else 
+               CUDA_ROOT=/usr/local/cuda
+               if [ -d "$CUDA_ROOT" -o -L  "$CUDA_ROOT" ] ; then
+                       export CUDA_ROOT=$CUDA_ROOT
+                       export CUDA_PATH=$CUDA_ROOT/cudaprof/bin:$CUDA_ROOT/bin
+                       export CUDA_LD_LIBRARY_PATH=$CUDA_ROOT/lib$CUDA_LIB_64:$CUDA_ROOT/lib
+               else 
+                       export CUDA_ROOT=
+                       export CUDA_PATH=
+                       export CUDA_LD_LIBRARY_PATH=
                fi
        fi
 fi
@@ -322,16 +340,18 @@ fi
 if [ -z "$CUDA_ROOT" ] ; then
        CUDA_OPTS="-UCUDA"
        export CUDA_OPTS
-elif [ -d "$CUDA_ROOT" ] ; then
+elif [ -d "$CUDA_ROOT" -o -L "$CUDA_ROOT" ] ; then
        CUDA_OPTS="-DCUDA"
+       export PATH=$CUDA_PATH:$PATH
+       export LD_LIBRARY_PATH=$CUDA_LD_LIBRARY_PATH:$LD_LIBRARY_PATH
+       export DYLD_LIBRARY_PATH=$CUDA_LD_LIBRARY_PATH:$DYLD_LIBRARY_PATH
 else
-       echo "NO Directory for CUDA. No need for cuda. "
+       #echo "NO Directory for CUDA. No need for cuda. "
        CUDA_OPTS="-UCUDA"
 fi
 export CUDA_OPTS
 
 ##### ATI
-#echo ".Eos_env(2):$LD_LIBRARY_PATH"
 #
 # ATI Stream SDK
 #
@@ -347,7 +367,6 @@ else
 #    read k v < <(echo "$LD_LIBRARY_PATH" | egrep "$ATISTREAMSDKROOT" )
     k=`echo "$LD_LIBRARY_PATH" | egrep "$ATISTREAMSDKROOT"` 
 #    IFS=$OIFS
-#      echo "()k=$k"
 #      echo "v=$v"
        if [ -z "$k" ] ; then
                if [ -d "$ATISTREAMROOT" ] ; then
@@ -358,7 +377,6 @@ else
 fi
 
 #### LIBGFORTRAN
-#echo ".Eos_env(3):$LD_LIBRARY_PATH"
 #
 # libgfortran
 #
@@ -382,7 +400,6 @@ else
 #    read k v < <(echo "$LD_LIBRARY_PATH" | egrep "$LD_LIBGFORTRAN" )
     k=`echo "$LD_LIBRARY_PATH" | egrep "$LD_LIBGFORTRAN`
 #    IFS=$OIFS
-#      echo "()k=$k"
 #      echo "v=$v"
        if [ -z "$k" ] ; then
                if [ ! -z "$LD_LIBRARY_PATH" ] ; then
@@ -394,7 +411,6 @@ else
 fi
 
 
-#echo ".Eos_env(4):$LD_LIBRARY_PATH"
 if [ -f $EOS_HOME/.acmlg/.bashrc ] ; then
        source $EOS_HOME/.acmlg/.bashrc
 fi