Browse Source

Disable MPI driver test in simgrid mode, this is unsupported

Samuel Thibault 6 years ago
parent
commit
8927316da0
2 changed files with 7 additions and 3 deletions
  1. 4 0
      mpi/src/mpi/starpu_mpi_mpi.c
  2. 3 3
      mpi/tests/Makefile.am

+ 4 - 0
mpi/src/mpi/starpu_mpi_mpi.c

@@ -1595,6 +1595,10 @@ void _starpu_mpi_driver_init(struct starpu_conf *conf)
 	char *driver_env = starpu_getenv("STARPU_MPI_DRIVER_CALL_FREQUENCY");
 	if (driver_env && atoi(driver_env) > 0)
 	{
+#ifdef STARPU_SIMGRID
+		_STARPU_DISP("Warning: MPI driver is not supported with simgrid, this will be disabled");
+		return;
+#endif
 		mpi_driver_call_freq = atoi(driver_env);
 
 		_STARPU_MALLOC(mpi_driver, sizeof(struct starpu_driver));

+ 3 - 3
mpi/tests/Makefile.am

@@ -127,8 +127,7 @@ starpu_mpi_TESTS +=				\
 	policy_selection			\
 	policy_selection2			\
 	ring_async_implicit			\
-	temporary				\
-	driver
+	temporary
 
 if !STARPU_SIMGRID
 starpu_mpi_TESTS +=				\
@@ -159,7 +158,8 @@ starpu_mpi_TESTS +=				\
 	tags_checking				\
 	sync					\
 	gather					\
-	gather2
+	gather2					\
+	driver
 
 if STARPU_USE_MPI_MPI
 starpu_mpi_TESTS +=				\