From d43a61808d7c59cbae8ff02ee1904a1d90e3e613 Mon Sep 17 00:00:00 2001
From: Tim Haines <thaines.astro@gmail.com>
Date: Thu, 11 Oct 2018 22:28:57 -0500
Subject: [PATCH] Compile hapi implementation with host compiler

Change-Id: I40684d64913bbd5d1b46505eb9d470274905b5bf
---
 src/arch/cuda/hybridAPI/Makefile                        | 13 +++++++------
 src/arch/cuda/hybridAPI/{hapi_impl.cu => hapi_impl.cpp} |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename src/arch/cuda/hybridAPI/{hapi_impl.cu => hapi_impl.cpp} (99%)

diff --git a/src/arch/cuda/hybridAPI/Makefile b/src/arch/cuda/hybridAPI/Makefile
index cda563cd95..883e76ca09 100644
--- a/src/arch/cuda/hybridAPI/Makefile
+++ b/src/arch/cuda/hybridAPI/Makefile
@@ -1,9 +1,10 @@
 CHARMDIR=../..
 -include $(CHARMDIR)/include/conv-mach-opt.mak
-CUDA_PATH=$(CUDA_DIR)
-NVCC=$(CUDA_PATH)/bin/nvcc
-NVCC_FLAGS=-c -use_fast_math -std=c++11 -DHAPI_MEMPOOL # -device-debug -deviceemu
-NVCC_INC=-I$(CUDA_PATH)/include -I..
+
+CUDA_PATH := $(CUDA_DIR)
+CHARMC    := $(CHARMDIR)/bin/charmc
+FLAGS     := $(OPTSATBUILDTIME) -DHAPI_MEMPOOL
+INC       := -I$(CUDA_PATH)/include -I..
 
 all: libs
 	cp libcudahybridapi.a $(CHARMDIR)/lib
@@ -17,8 +18,8 @@ libcudahybridapi.a: hybridapi.o
 	-rm -f $@
 	ar q $@ hybridapi.o
 
-hybridapi.o: hapi_impl.cu hapi_impl.h hapi.h hapi_nvtx.h
-	$(NVCC) $(NVCC_FLAGS) $(NVCC_INC) -o hybridapi.o hapi_impl.cu
+hybridapi.o: hapi_impl.cpp hapi_impl.h hapi.h hapi_nvtx.h
+	$(CHARMC) $(FLAGS) $(INC) -o $@ $<
 
 clean:
 	rm -f *.o *.a
diff --git a/src/arch/cuda/hybridAPI/hapi_impl.cu b/src/arch/cuda/hybridAPI/hapi_impl.cpp
similarity index 99%
rename from src/arch/cuda/hybridAPI/hapi_impl.cu
rename to src/arch/cuda/hybridAPI/hapi_impl.cpp
index 7b88fbb821..8da968a9cd 100644
--- a/src/arch/cuda/hybridAPI/hapi_impl.cu
+++ b/src/arch/cuda/hybridAPI/hapi_impl.cpp
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <queue>
 #include <atomic>
+#include "cuda.h"
 
 #ifdef HAPI_NVTX_PROFILE
 #include "hapi_nvtx.h"
-- 
2.11.4.GIT