Merge branch 'charm' of charmgit:charm into charm
authorLukasz Wesolowski <wesolwsk@talent.cs.uiuc.edu>
Wed, 3 Mar 2010 22:31:19 +0000 (16:31 -0600)
committerLukasz Wesolowski <wesolwsk@talent.cs.uiuc.edu>
Wed, 3 Mar 2010 22:31:19 +0000 (16:31 -0600)
src/arch/cuda/hybridAPI/cuda-hybrid-api.cu
src/arch/net-linux-amd64-cuda/conv-mach.sh

index 9cf8f4b9f0b3ec239988ec9197c3650548f04e8c..d10e5695426270b861012a6c14b613ee7e8ff538 100644 (file)
@@ -166,6 +166,7 @@ void pinnedMallocHost(pinnedMemReq *reqs) {
   else {
     pinnedMemQueue[pinnedMemQueueIndex].hostPtrs = reqs->hostPtrs;
     pinnedMemQueue[pinnedMemQueueIndex].sizes = reqs->sizes; 
+    pinnedMemQueue[pinnedMemQueueIndex].nBuffers = reqs->nBuffers; 
     pinnedMemQueue[pinnedMemQueueIndex].callbackFn = reqs->callbackFn;     
     pinnedMemQueueIndex++;
     if (pinnedMemQueueIndex == MAX_PINNED_REQ) {
index fb13206f8bd39c16d962a66a5c341bfbef88fbe9..ca26155a0c8dd46afe9c61fa53e0fb212642ff82 100644 (file)
@@ -11,8 +11,8 @@ 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/lib -L$NVIDIA_CUDA_SDK/lib"
-CMK_LIBS="-lckqt -lcuda -lcudart -lGL -lcutil -lcudahybridapi"
+CMK_LIBDIR="-L$CUDA_DIR/lib64 -L$NVIDIA_CUDA_SDK/lib"
+CMK_LIBS="-lckqt -lcuda -lcudart -lGL -lcutil_x86_64 -lcudahybridapi"
 CMK_RANLIB="ranlib"
 
 # native compiler for compiling charmxi, etc