Cleanup relating to the most recent GPU Manager change.
authorLukasz Wesolowski <wesolwsk@talent.cs.illinois.edu>
Wed, 5 Oct 2011 22:39:03 +0000 (17:39 -0500)
committerLukasz Wesolowski <wesolwsk@illinois.edu>
Wed, 5 Oct 2011 22:42:30 +0000 (17:42 -0500)
examples/charm++/cuda/gpuManager/overlapTestGPUManager/Makefile
src/arch/cuda/hybridAPI/Makefile
src/arch/cuda/hybridAPI/cuda-hybrid-api.cu
src/arch/net-linux-amd64-cuda/conv-mach.sh

index 23c28b947405f9f5c3806e8b79283458862be2b8..fa397a1a6d6ba19177108020311aacaa7a1f2c37 100644 (file)
@@ -4,11 +4,7 @@ OBJS = overlapTest.o overlapTestCU.o
 
 NVCC = /usr/local/cuda/bin/nvcc 
 NVCC_FLAGS = -O3 -c -use_fast_math #-device-debug -deviceemu 
-NVCC_INC = -I/usr/local/cuda/include -I/usr/local/NVIDIA_GPU_Computing_SDK/C/common/inc -I../../../../../src/arch/cuda/hybridAPI
-
-#LD_LIBS += -lcuda -lcudart -lGL -lGLU -L../../../../NVIDIA_CUDA_SDK/lib -lcutil
-
-LD_LIBS += -L/usr/local/NVIDIA_GPU_Computing_SDK/C/lib -lcutil_x86_64
+NVCC_INC = -I/usr/local/cuda/include  -I../../../../../src/arch/cuda/hybridAPI
 
 export LD_RUN_PATH = /usr/local/cuda/lib64
 
index b8e10313446fe54fda1fbc2bf9df2730daf3142c..76556ad84d3295a1b18e40af3696e9b3b155807c 100644 (file)
@@ -1,11 +1,10 @@
 CUDA_DIR=/usr/local/cuda
-NVIDIA_CUDA_SDK=/usr/local/NVIDIA_GPU_Computing_SDK/C
 CHARMDIR=../../
 CHARMC=$(CHARMDIR)/bin/charmc
 
 NVCC = $(CUDA_DIR)/bin/nvcc
 NVCC_FLAGS = -c -use_fast_math -DGPU_MEMPOOL #-DGPU_PROFILE -DGPU_TRACE #-DGPU_MEMPOOL_DEBUG -DGPU_WRQ_VERBOSE #-device-debug -deviceemu
-NVCC_INC = -I$(CUDA_DIR)/include -I$(NVIDIA_CUDA_SDK)/common/inc -I.. 
+NVCC_INC = -I$(CUDA_DIR)/include -I.. 
 
 RM = rm -f
 
index 94f9fb336768381b1b604501a335019992440768..b20d40b16d3c101dc7cef77c032a9a3715fa7369 100644 (file)
@@ -59,7 +59,7 @@ extern int CmiMyPe();
  *  completion of GPU events: memory allocation, transfer and
  *  kernel execution
  */  
-#define GPU_TRACE
+//#define GPU_TRACE
 //#define GPU_DEBUG
 //#define _DEBUG
 
index 08b33db25f1321da03f7958dd1658842e1ca3f29..96f0ce8841e3cf3b13ef937bc658506ca2b02178 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$CUDA_DIR/lib64 -L$NVIDIA_CUDA_SDK/lib"
+CMK_LIBDIR="-L$CUDA_DIR/lib64"
 CMK_LIBS="-lckqt -lcuda -lcudart -lGL -lcudahybridapi"
 CMK_RANLIB="ranlib"