|
@@ -1,6 +1,6 @@
|
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
|
*
|
|
|
- * Copyright (C) 2012-2016 Université de Bordeaux
|
|
|
+ * Copyright (C) 2012-2017 Université de Bordeaux
|
|
|
* Copyright (C) 2016 Inria
|
|
|
* Copyright (C) 2016, 2017 CNRS
|
|
|
*
|
|
@@ -25,6 +25,9 @@
|
|
|
#include <core/perfmodel/perfmodel.h>
|
|
|
#include <core/workers.h>
|
|
|
#include <core/simgrid.h>
|
|
|
+#if defined(HAVE_SG_LINK_NAME) && (SIMGRID_VERSION_MAJOR >= 4 || (SIMGRID_VERSION_MAJOR == 3 && SIMGRID_VERSION_MINOR >= 13))
|
|
|
+#include <simgrid/simdag.h>
|
|
|
+#endif
|
|
|
|
|
|
#ifdef STARPU_SIMGRID
|
|
|
#include <sys/resource.h>
|
|
@@ -719,7 +722,7 @@ _starpu_simgrid_get_memnode_host(unsigned node)
|
|
|
|
|
|
void _starpu_simgrid_count_ngpus(void)
|
|
|
{
|
|
|
-#if defined(HAVE_SG_LINK_NAME) && SIMGRID_VERSION_MAJOR >= 4 || (SIMGRID_VERSION_MAJOR == 3 && SIMGRID_VERSION_MINOR >= 13)
|
|
|
+#if defined(HAVE_SG_LINK_NAME) && (SIMGRID_VERSION_MAJOR >= 4 || (SIMGRID_VERSION_MAJOR == 3 && SIMGRID_VERSION_MINOR >= 13))
|
|
|
unsigned src, dst;
|
|
|
msg_host_t ramhost = _starpu_simgrid_get_host_by_name("RAM");
|
|
|
|