julia: Fix CUDA compilation.

julia/src/dynamic_compiler/Makefile.am

@@ -14,33 +14,35 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-#LD=$(CC_OR_NVCC)
-LD=$(CC)
-AM_CPPFLAGS = -I$(abs_top_srcdir)/include/ -I$(abs_top_builddir)/src -I$(abs_top_builddir)/include
+LD=$(CC_OR_NVCC)
+AM_CPPFLAGS = -I$(abs_top_srcdir)/include/ -I$(abs_top_builddir)/src -I$(abs_top_builddir)/include \
+	 -I$(abs_top_srcdir)/julia/src/
+
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(HWLOC_CFLAGS) $(GLOBAL_AM_CFLAGS)
 AM_CFLAGS += -fPIC -O3 -g -DSTRIDE=${STRIDE} -Wall -mavx -fomit-frame-pointer -march=native -ffast-math
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@
-#CUDA_CFLAGS = ${CFLAGS}
-
+CUDA_CFLAGS = $(STARPU_CUDA_CPPFLAGS) -Wno-deprecated-gpu-targets
+LDFLAGS = -L @STARPU_BUILD_DIR@/julia/src/.libs/ -lstarpujulia-1.3
 EXTERNLIB=extern_tasks.so
 GENERATEDLIB=generated_tasks.so
 
 C_OBJECTS=$(patsubst %.c,%.o,$(wildcard gen*.c))
-#if STARPU_USE_CUDA
-#CUDA_OBJECTS=$(patsubst %.cu,%.o,$(wildcard gen*.cu))
-#else
+
+if STARPU_USE_CUDA
+CUDA_OBJECTS=$(patsubst %.cu,%.o,$(wildcard gen*.cu))
+else
 CUDA_OBJECTS=
-#endif
+endif
 
 %.o: %.c
 	$(CC) -c $(AM_CPPFLAGS) $(AM_CFLAGS) $^ -o $@
 
 %.o: %.cu
-	$(NVCC) -dc $(CUDA_CFLAGS) $^ --shared --compiler-options '-fPIC' -o $@ $(LDFLAGS)
+	$(NVCC) -dc $(AM_CPPFLAGS) $(CUDA_CFLAGS) $^ --shared --compiler-options '-fPIC' -o $@ $(LDFLAGS)
 
 ${EXTERNLIB}: $(SOURCES_CPU)
 	$(CC) $(AM_CPPFLAGS) $(AM_CFLAGS) -shared -fPIC $(LDFLAGS) $^ -o $@
 
 ${GENERATEDLIB}: $(C_OBJECTS) $(CUDA_OBJECTS)
-	$(LD) -shared $(LDFLAGS) $^ -o $@
+	$(LD) -shared $^ -o $@ $(LDFLAGS)