From 4a82524ac6cd6dee45f0add73abd5a85898727db Mon Sep 17 00:00:00 2001
From: Akash Kothari <akashk4@tyler.cs.illinois.edu>
Date: Tue, 14 Jan 2020 10:47:20 -0600
Subject: [PATCH] Update Makefiles to use CUDA runtime

---
 hpvm/test/parboil/common/Makefile.conf | 9 ++++-----
 hpvm/test/parboil/common/mk/visc.mk    | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/hpvm/test/parboil/common/Makefile.conf b/hpvm/test/parboil/common/Makefile.conf
index 31e0d44d62..9d3123260c 100644
--- a/hpvm/test/parboil/common/Makefile.conf
+++ b/hpvm/test/parboil/common/Makefile.conf
@@ -1,5 +1,4 @@
-CUDA_PATH=/usr/local/cuda
-CUDA_LIB_PATH=/usr/local/cuda/lib64
-OPENCL_PATH=/opt/intel/opencl-sdk
-OPENCL_LIB_PATH=/usr/lib64
-
+CUDA_PATH=/software/cuda-9.1/ 
+CUDA_LIB_PATH=/software/cuda-9.1/lib64/  
+OPENCL_PATH=/opt/intel/opencl-sdk/
+OPENCL_LIB_PATH=/usr/lib64/
diff --git a/hpvm/test/parboil/common/mk/visc.mk b/hpvm/test/parboil/common/mk/visc.mk
index 5a12945b31..7703903584 100755
--- a/hpvm/test/parboil/common/mk/visc.mk
+++ b/hpvm/test/parboil/common/mk/visc.mk
@@ -3,7 +3,7 @@
 # Default language wide options
 LANG_CFLAGS=-I$(PARBOIL_ROOT)/common/include
 LANG_CXXFLAGS=$(LANG_CFLAGS) -fno-exceptions
-LANG_LDFLAGS=-lOpenCL -L$(OPENCL_LIB_PATH) -lrt
+LANG_LDFLAGS=-lOpenCL -L$(OPENCL_LIB_PATH) -lrt -L$(CUDA_LIB_PATH) -lcudart
 
 CFLAGS=$(LANG_CFLAGS) $(PLATFORM_CFLAGS) $(APP_CFLAGS)
 CXXFLAGS=$(LANG_CXXFLAGS) $(PLATFORM_CXXFLAGS) $(APP_CXXFLAGS)
@@ -154,11 +154,11 @@ default: $(FAILSAFE) $(BUILDDIR) $(PTX_ASSEMBLY) $(SPIR_ASSEMBLY) $(BIN)
 #default: $(FAILSAFE) $(BUILDDIR) $(BIN)
 
 run : $(RUNDIR)
-	echo "Resolving OpenCL library..."
-	$(shell echo $(RUNTIME_ENV)) LD_LIBRARY_PATH=$(OPENCL_LIB_PATH) ldd ./$(BIN) | grep OpenCL
+	echo "Resolving CUDA library..."
+	$(shell echo $(RUNTIME_ENV)) LD_LIBRARY_PATH=$(CUDA_LIB_PATH) ldd ./$(BIN) | grep cuda
 	#echo "Resolving OpenCV library..."
 	#$(shell echo $(RUNTIME_ENV)) LD_LIBRARY_PATH=$(OPENCV_LIB_PATH) ldd ./$(BIN) | grep opencv
-	$(shell echo $(RUNTIME_ENV)) LD_LIBRARY_PATH=$(OPENCL_LIB_PATH):$(OPENCV_LIB_PATH) ./$(BIN) $(ARGS)
+	$(shell echo $(RUNTIME_ENV)) LD_LIBRARY_PATH=$(OPENCL_LIB_PATH):$(OPENCV_LIB_PATH):$(CUDA_LIB_PATH) ./$(BIN) $(ARGS)
 	$(TOOL) $(OUTPUT) $(REF_OUTPUT)
 
 debug:
-- 
GitLab