소스 검색

Move starpu_replay to its own directory, so we can build it with mpicc

Samuel Thibault 5 년 전
부모
커밋
786cb4cfe5
7개의 변경된 파일49개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 0
      configure.ac
  2. 2 2
      examples/mult/sgemm.sh
  3. 2 2
      tests/overlap/overlap.sh
  4. 4 9
      tools/Makefile.am
  5. 40 0
      tools/replay/Makefile.am
  6. 0 0
      tools/replay/starpu_replay.c
  7. 0 0
      tools/replay/starpu_replay_sched.c

+ 1 - 0
configure.ac

@@ -3567,6 +3567,7 @@ AC_OUTPUT([
 	Makefile
 	src/Makefile
 	tools/Makefile
+	tools/replay/Makefile
 	tools/starpu_env
 	tools/starpu_codelet_profile
 	tools/starpu_codelet_histo_profile

+ 2 - 2
examples/mult/sgemm.sh

@@ -67,8 +67,8 @@ then
 	$PREFIX/../../tools/starpu_codelet_histo_profile distrib.data || true
 	[ -f distrib.data.starpu_sgemm_gemm.0.492beed5.33177600.pdf ] || true
 
-	if [ -x $PREFIX/../../tools/starpu_replay ]; then
-		$STARPU_LAUNCH $PREFIX/../../tools/starpu_replay tasks.rec
+	if [ -x $PREFIX/../../tools/replay/starpu_replay ]; then
+		$STARPU_LAUNCH $PREFIX/../../tools/replay/starpu_replay tasks.rec
 	fi
 
 	[ ! -x $PREFIX/../../tools/starpu_perfmodel_recdump ] || $STARPU_LAUNCH $PREFIX/../../tools/starpu_perfmodel_recdump tasks.rec -o perfs2.rec

+ 2 - 2
tests/overlap/overlap.sh

@@ -67,8 +67,8 @@ then
 	$PREFIX/../../tools/starpu_codelet_histo_profile distrib.data || true
 	[ -f distrib.data.overlap_sleep_1024_24.0.a3d3725e.1024.pdf ] || true
 
-	if [ -x $PREFIX/../../tools/starpu_replay ]; then
-		$STARPU_LAUNCH $PREFIX/../../tools/starpu_replay tasks.rec
+	if [ -x $PREFIX/../../tools/replay/starpu_replay ]; then
+		$STARPU_LAUNCH $PREFIX/../../tools/replay/starpu_replay tasks.rec
 	fi
 
 	[ ! -x $PREFIX/../../tools/starpu_perfmodel_recdump ] || $STARPU_LAUNCH $PREFIX/../../tools/starpu_perfmodel_recdump tasks.rec -o perfs2.rec

+ 4 - 9
tools/Makefile.am

@@ -20,6 +20,10 @@ include $(top_srcdir)/starpu.mk
 
 SUBDIRS =
 
+if STARPU_SIMGRID
+SUBDIRS += replay
+endif
+
 AM_CFLAGS = $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(STARPU_COI_CPPFLAGS) $(GLOBAL_AM_CFLAGS)
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@ $(FXT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src
@@ -391,15 +395,6 @@ bin_PROGRAMS += 			\
 	starpu_lp2paje			\
 	starpu_perfmodel_recdump
 
-if STARPU_SIMGRID
-bin_PROGRAMS += 			\
-	starpu_replay
-
-starpu_replay_SOURCES = \
-	starpu_replay.c \
-	starpu_replay_sched.c
-endif
-
 starpu_perfmodel_plot_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(FXT_CFLAGS)
 
 if STARPU_LONG_CHECK

+ 40 - 0
tools/replay/Makefile.am

@@ -0,0 +1,40 @@
+# StarPU --- Runtime system for heterogeneous multicore architectures.
+#
+# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2013       Joris Pablo
+# Copyright (C) 2013       Thibaut Lambert
+# Copyright (C) 2017       Erwan Leria
+#
+# StarPU is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# StarPU is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# See the GNU Lesser General Public License in COPYING.LGPL for more details.
+#
+include $(top_srcdir)/starpu.mk
+
+SUBDIRS =
+
+AM_CFLAGS = $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(STARPU_COI_CPPFLAGS) $(GLOBAL_AM_CFLAGS)
+LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@ $(FXT_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src
+AM_LDFLAGS = @STARPU_EXPORT_DYNAMIC@ $(STARPU_COI_LDFLAGS) $(STARPU_SCIF_LDFLAGS)
+
+CC=$(CC_OR_MPICC)
+CCLD=$(CC_OR_MPICC)
+
+if STARPU_USE_MPI
+LIBS += ../../mpi/src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
+AM_CPPFLAGS += -I$(top_srcdir)/mpi/include
+endif
+
+bin_PROGRAMS = starpu_replay
+
+starpu_replay_SOURCES = \
+	starpu_replay.c \
+	starpu_replay_sched.c

tools/starpu_replay.c → tools/replay/starpu_replay.c


tools/starpu_replay_sched.c → tools/replay/starpu_replay_sched.c