GPUManager: minor changes to prevent most warnings.
authorLukasz Wesolowski <wesolwsk@illinois.edu>
Fri, 6 Jan 2012 04:30:41 +0000 (22:30 -0600)
committerLukasz Wesolowski <wesolwsk@illinois.edu>
Fri, 6 Jan 2012 04:31:22 +0000 (22:31 -0600)
src/arch/cuda/hybridAPI/Makefile
src/arch/cuda/hybridAPI/cuda-hybrid-api.cu

index 627fc2cad835c46989a1477f704c8d9762cbc189..08a8883a6c07cfa58e3accb9401c77960c8e0272 100644 (file)
@@ -1,13 +1,11 @@
 #CUDA_DIR=/usr/local/cuda
-CHARMDIR=../../
+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.. 
 
-RM = rm -f
-
 all: libs
        cp libcudahybridapi.a $(CHARMDIR)/lib
 
@@ -18,7 +16,7 @@ install: libcudahybridapi.a
 #      cp hybridapi.o wrqueue.o $(CHARMDIR)/tmp
 
 libcudahybridapi.a: hybridapi.o wrqueue.o
-       -rm $@
+       -rm -f $@
        ar q $@ hybridapi.o wrqueue.o 
 
 hybridapi.o: cuda-hybrid-api.cu cuda-hybrid-api.h
index b20d40b16d3c101dc7cef77c032a9a3715fa7369..1fc95d0befd30bfd4965e8517d8b7d69cf7763a6 100644 (file)
@@ -29,9 +29,7 @@ void cudaErrorDie(int err,const char *code,const char *file,int line)
          " Return value %d from '%s'.  Exiting.\n",
          file,line,
          err,code);
-  int ret;
   abort();
-  exit(ret);
 }
 
 #define cudaChk(code)                                                  \