|
@@ -196,9 +196,9 @@ int main(int argc, char **argv)
|
|
|
{
|
|
|
char path[256];
|
|
|
|
|
|
- if (!starpu_main)
|
|
|
+ if (!starpu_main && !(smpi_main && smpi_simulated_main_))
|
|
|
{
|
|
|
- _STARPU_ERROR("In simgrid mode, the file containing the main() function of this application needs to be compiled with starpu.h or starpu_simgrid_wrap.h included, to properly rename it into starpu_main\n");
|
|
|
+ _STARPU_ERROR("In simgrid mode, the file containing the main() function of this application needs to be compiled with starpu.h included, to properly rename it into starpu_main\n");
|
|
|
exit(EXIT_FAILURE);
|
|
|
}
|
|
|
|
|
@@ -238,9 +238,9 @@ int main(int argc, char **argv)
|
|
|
|
|
|
void _starpu_simgrid_init()
|
|
|
{
|
|
|
- if (!starpu_main)
|
|
|
+ if (!starpu_main && !(smpi_main && smpi_simulated_main_))
|
|
|
{
|
|
|
- _STARPU_ERROR("In simgrid mode, the file containing the main() function of this application needs to be compiled with starpu.h or starpu_simgrid_wrap.h included, to properly rename it into starpu_main\n");
|
|
|
+ _STARPU_ERROR("In simgrid mode, the file containing the main() function of this application needs to be compiled with starpu.h included, to properly rename it into starpu_main\n");
|
|
|
exit(EXIT_FAILURE);
|
|
|
}
|
|
|
if (_starpu_simgrid_running_smpi())
|