Browse Source

move defining STARPU_HOSTNAME/PERF_MODEL_DIR for simgrid in Makefiles where that is needed, so that make check -C examples works too

Samuel Thibault 9 years ago
parent
commit
97aff57b95
3 changed files with 14 additions and 7 deletions
  1. 0 7
      Makefile.am
  2. 7 0
      examples/Makefile.am
  3. 7 0
      examples/stencil/Makefile.am

+ 0 - 7
Makefile.am

@@ -16,13 +16,6 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-if STARPU_SIMGRID
-STARPU_PERF_MODEL_DIR=$(abs_top_srcdir)/tools/perfmodels/sampling
-STARPU_HOSTNAME=mirage
-export STARPU_HOSTNAME
-export STARPU_PERF_MODEL_DIR
-endif
-
 ACLOCAL_AMFLAGS=-I m4
 CLEANFILES = *.gcno *.gcda *.linkinfo
 

+ 7 - 0
examples/Makefile.am

@@ -19,6 +19,13 @@
 
 include $(top_srcdir)/starpu.mk
 
+if STARPU_SIMGRID
+STARPU_PERF_MODEL_DIR=$(abs_top_srcdir)/tools/perfmodels/sampling
+STARPU_HOSTNAME=mirage
+export STARPU_PERF_MODEL_DIR
+export STARPU_HOSTNAME
+endif
+
 AM_CFLAGS = $(MAGMA_CFLAGS) $(HWLOC_CFLAGS) -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(GLOBAL_AM_CFLAGS) -Wno-unused
 AM_CXXFLAGS = $(MAGMA_CFLAGS) $(HWLOC_CFLAGS) -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(GLOBAL_AM_CXXFLAGS) -Wno-unused
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ $(MAGMA_LIBS) $(HWLOC_LIBS) @LIBS@ $(FXT_LIBS)

+ 7 - 0
examples/stencil/Makefile.am

@@ -15,6 +15,13 @@
 
 include $(top_srcdir)/starpu.mk
 
+if STARPU_SIMGRID
+STARPU_PERF_MODEL_DIR=$(abs_top_srcdir)/tools/perfmodels/sampling
+STARPU_HOSTNAME=mirage
+export STARPU_PERF_MODEL_DIR
+export STARPU_HOSTNAME
+endif
+
 AM_CFLAGS = $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(GLOBAL_AM_CFLAGS) -Wno-unused
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ $(HWLOC_LIBS) @LIBS@ $(FXT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/examples/ -I$(top_builddir)/include