CUDA: Modified the Makefile and configuration files to use environment
authorLukasz Wesolowski <wesolwsk@illinois.edu>
Thu, 25 Feb 2010 22:29:30 +0000 (16:29 -0600)
committerLukasz Wesolowski <wesolwsk@illinois.edu>
Thu, 25 Feb 2010 22:29:30 +0000 (16:29 -0600)
variables NVIDIA_CUDA_SDK and CUDA_DIR as locations of the SDK and the
toolkit, respectively.

src/arch/cuda/hybridAPI/Makefile
src/arch/net-linux-amd64-cuda/conv-mach-ibverbs.sh
src/arch/net-linux-amd64-cuda/conv-mach.sh

index 1c996d6baec237d1faaa25ad019eea3e6355c6f2..4a4ad0c37dd50a447039b8c3f36668b1bfa5896d 100644 (file)
@@ -1,9 +1,9 @@
 CHARMDIR=../../
 CHARMC=$(CHARMDIR)/bin/charmc
 
-NVCC = /usr/local/cuda/bin/nvcc
+NVCC = $(CUDA_DIR)/bin/nvcc
 NVCC_FLAGS = -c -use_fast_math #-DGPU_MEMPOOL -DGPU_MEMPOOL_DEBUG -DGPU_WRQ_VERBOSE #-device-debug -deviceemu
-NVCC_INC = -I/usr/local/cuda/include -I$(HOME)/NVIDIA_CUDA_SDK/common/inc -I.. 
+NVCC_INC = -I$(CUDA_DIR)/include -I$(NVIDIA_CUDA_SDK)/common/inc -I.. 
 
 RM = rm -f
 
index 37429af433f527c559d5202866b0c40aa046f595..7aa875d72af5a9b207f4624d1673632db2b9e0ce 100644 (file)
@@ -5,12 +5,12 @@ then
   if test -f /opt/ofed/include/infiniband/verbs.h
   then
     CMK_INCDIR="-I/opt/ofed/include/"
-    CMK_LIBDIR="$CMK_LIBDIR -L/opt/ofed/lib64"
+    CMK_LIBDIR="-L/opt/ofed/lib64"
        fi
   if test -f /usr/local/ofed/include/infiniband/verbs.h
   then
     CMK_INCDIR="-I/usr/local/ofed/include/"
-    CMK_LIBDIR="$CMK_LIBDIR -L/usr/local/ofed/lib64"
+    CMK_LIBDIR="-L/usr/local/ofed/lib64"
        fi
 fi
 
index e74bd36ea8fa931f26129d7312d7efc94d79bea9..0696d6db9db471d515424566e798e17fbec4bb61 100644 (file)
@@ -11,7 +11,7 @@ CMK_LD="$CMK_CC $CMK_AMD64 "
 CMK_LDXX="$CMK_CXX $CMK_AMD64 "
 CMK_LD_SHARED="-shared"
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
-CMK_LIBDIR="-L/usr/local/cuda/lib -L$HOME/NVIDIA_CUDA_SDK/lib"
+CMK_LIBDIR="-L($CUDA_DIR)/lib -L($NVIDIA_CUDA_SDK)/lib"
 CMK_LIBS="-lckqt -lcuda -lcudart -lGL -lcutil -lcudahybridapi"
 CMK_RANLIB="ranlib"