add cudamex and cudaoct makefile targets

fangq · Nov 2, 2022 · 9809be0 · 9809be0
1 parent f455d1e
commit 9809be0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/commons/Makefile_common.mk b/commons/Makefile_common.mk
@@ -201,6 +201,8 @@ ifeq ($(TARGETSUFFIX),.a)
 endif
 
 cuda: sse
+cudamex: mex
+cudaoct: oct
 
 all release sse ssemath prof omp mex oct mexomp octomp pnacl web debug cuda: $(SUBDIRS) $(BINDIR)/$(BINARY)
 

diff --git a/src/Makefile b/src/Makefile
@@ -15,11 +15,12 @@ USERCCFLAGS=-DUSE_OS_TIMER -DUSE_OPENCL -DMMC_XORSHIFT
 
 DUMMY:=$(shell mkdir -p built/cjson)
 
-ifeq ($(MAKECMDGOALS),cuda)
+ifeq ($(MAKECMDGOALS),$(filter $(MAKECMDGOALS),cuda cudamex cudaoct))
     FILES+=mmc_cu_host
     USERCCFLAGS+=-DUSE_CUDA
-    CUCCOPT= -DUSE_ATOMIC -DMCX_SAVE_DETECTORS -DMCX_DO_REFLECTION -DUSE_DMMC -DUSE_BLBADOUEL
+    CUCCOPT= -DUSE_ATOMIC -DMCX_SAVE_DETECTORS -DMCX_DO_REFLECTION -DUSE_DMMC -DUSE_BLBADOUEL -Xcompiler -fPIC
     EXTRALIB+=-lcudart
+    MEXLINKOPT+=-lcudart
 endif
 
 include $(ROOTDIR)/commons/Makefile_common.mk
diff --git a/src/mmclab.cpp b/src/mmclab.cpp
@@ -47,7 +47,12 @@
 #include "mex.h"
 #include "mmc_mesh.h"
 #include "mmc_host.h"
-#include "mmc_cl_host.h"
+#ifdef USE_OPENCL
+    #include "mmc_cl_host.h"
+#endif
+#ifdef USE_CUDA
+    #include "mmc_cu_host.h"
+#endif
 #include "mmc_tictoc.h"
 #include "mmc_raytrace.h"
 #include "waitmex/waitmex.c"