diff --git a/hpvm/test/parboil/common/Makefile.conf b/hpvm/test/parboil/common/Makefile.conf index 31e0d44d62b351ef3b9e0b1f86647e2ffcdb6211..9d3123260c6322443de8541685312a824c802a39 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 5a12945b317ef40435041347e87027100b8bbf1f..7703903584b06d8f6b13ffacef8481be6b4ed8b2 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: