Forráskód Böngészése

Include the dynamically loaded ELF code in the distribution.

Cédric Augonnet 16 éve
szülő
commit
395d7cbd95
2 módosított fájl, 20 hozzáadás és 8 törlés
  1. 3 7
      examples/Makefile.am
  2. 17 1
      tests/Makefile.am

+ 3 - 7
examples/Makefile.am

@@ -64,9 +64,11 @@ SPULDFLAGS =
 SPULIBS = -lblas #-lc -lgloss -lc
 
 .c.spuo:
+	$(MKDIR_P) `dirname $@`
 	$(SPU_CC) -c -fpic $< -o $@
 
 .spuo.spuelf:
+	$(MKDIR_P) `dirname $@`
 	$(SPU_LD) $(SPULDFLAGS) $< -o $@ $(SPULIBS)
 
 BUILT_SOURCES +=				\
@@ -88,6 +90,7 @@ noinst_HEADERS = 				\
 	common/blas_model.h			\
 	common/blas.h				\
 	mult/dw_mult.h				\
+	mult/gordon/func_sgemm_ibm.h		\
 	cuda/incrementer_cuda.h			\
 	gordon/null.h				\
 	fortran/bindings/StarPU-fortran.h	\
@@ -173,13 +176,6 @@ mult_dw_mult_no_filters_SOURCES =		\
 	common/blas.c				\
 	common/blas_model.c
 
-if USE_GORDON
-
-BUILT_SOURCES +=				\
-	mult/gordon/func_sgemm_ibm.spuelf
-
-endif
-
 endif
 
 ####################

+ 17 - 1
tests/Makefile.am

@@ -17,7 +17,14 @@
 LIBS = $(top_builddir)/src/libstarpu.la @LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/include/
 
-CLEANFILES = *.gcno *.gcda *.linkinfo
+EXTRA_DIST =					\
+	microbenchs/null_kernel_gordon.c	\
+	microbenchs/sync_and_notify_data_gordon_kernels.c
+
+CLEANFILES = 					\
+	*.gcno *.gcda *.linkinfo		\
+	microbenchs/null_kernel_gordon.spuelf	\
+	microbenchs/sync_and_notify_data_gordon_kernels.spuelf
 
 BUILT_SOURCES =
 
@@ -33,6 +40,7 @@ NVCCFLAGS += -I$(top_srcdir)/include/
 	$(NVCC) -cubin $< -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS)
 
 .cu.o:
+	$(MKDIR_P) `dirname $@`
 	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I${includedir}
 
 endif
@@ -43,11 +51,16 @@ SPU_CC ?= spu-gcc
 SPU_LD ?= spu-ld
 
 .c.spuo:
+	$(MKDIR_P) `dirname $@`
 	$(SPU_CC) -c -fpic $< -o $@
 
 .spuo.spuelf:
+	$(MKDIR_P) `dirname $@`
 	$(SPU_LD) $< -o $@
 
+#BUILT_SOURCES +=
+#	microbenchs/null_kernel_gordon.spuelf
+
 endif
 
 SUBDIRS = 
@@ -80,6 +93,9 @@ microbenchs_sync_and_notify_data_SOURCES +=	\
 endif
 
 if USE_GORDON
+microbenchs_sync_and_notify_data_SOURCES +=	\
+	microbenchs/sync_and_notify_data_gordon_kernels.c
+
 BUILT_SOURCES += 						\
 	microbenchs/sync_and_notify_data_gordon_kernels.spuelf	\
 	microbenchs/null_kernel_gordon.spuelf