소스 검색

Fix back case when the application is built with smpicc

Samuel Thibault 10 년 전
부모
커밋
ebb0836b46
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      src/core/simgrid.c

+ 4 - 4
src/core/simgrid.c

@@ -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())