From b4763185cbf44b0f447fe34cc8f24538046e72e0 Mon Sep 17 00:00:00 2001 From: fatene Date: Thu, 29 Jan 2009 16:33:58 +0000 Subject: [PATCH] Assure compatibility with gcc 4.3 git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1375 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/cmakemodif/installParadiseo.sh | 156 ++++++++++-------- .../paradiseo-peo/src/core/runner.cpp | 29 +++- .../paradiseo-peo/src/rmc/mpi/node.cpp | 7 + .../paradiseo-peo/src/rmc/mpi/node.h | 2 + .../paradiseo-peo/src/rmc/mpi/schema.cpp | 6 +- .../paradiseo-peo/test/CMakeLists.txt | 19 ++- .../cmakemodif/paradiseo-peo/test/schema.xml | 1 - .../paradiseo-peo/test/t-Mpdallexit.cpp | 3 +- .../paradiseo-peo/test/t-Mpdboot.cpp | 3 +- 9 files changed, 143 insertions(+), 83 deletions(-) diff --git a/branches/cmakemodif/installParadiseo.sh b/branches/cmakemodif/installParadiseo.sh index 691d8591f..1888757c5 100755 --- a/branches/cmakemodif/installParadiseo.sh +++ b/branches/cmakemodif/installParadiseo.sh @@ -40,9 +40,9 @@ CTEST_CONFIG=$CTEST_DEFAULT_CONFIG MIN_CMAKE_FLAGS='-DENABLE_MINIMAL_CMAKE_TESTING=TRUE' # install types to select in the main menu -P_FULL_INSTALL=1 -P_BASIC_INSTALL=2 -P_PARALLEL_INSTALL=3 +P_BASIC_INSTALL=1 +P_PARALLEL_INSTALL=2 +P_FULL_INSTALL=3 P_RM_PREVIOUS_INSTALLL=4 P_EXIT_INSTALL=5 @@ -75,34 +75,34 @@ S_CHECK_AUTOTOOLS=1018 #### define what are the possible installs and their content # full install -FULL_INSTALL="$S_INTRODUCTION $S_UNPACK_LIBXML $S_UNPACK_MPICH $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CHECK_AUTOTOOLS $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_ENV $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END" +FULL_INSTALL="$S_INTRODUCTION $S_UNPACK_LIBXML $S_UNPACK_MPICH $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CHECK_AUTOTOOLS $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_ENV $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END" -FULL_INSTALL_WITHOUT_LIBXML2="$S_INTRODUCTION $S_UNPACK_MPICH $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CHECK_AUTOTOOLS $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_MPICH_ENV $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END" +FULL_INSTALL_WITHOUT_LIBXML2="$S_INTRODUCTION $S_UNPACK_MPICH $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CHECK_AUTOTOOLS $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_MPICH_ENV $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END" -FULL_INSTALL_WITHOUT_MPICH2="$S_INTRODUCTION $S_UNPACK_LIBXML $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CHECK_AUTOTOOLS $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_CONFIGURE_LIBXML2_ENV $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END" +FULL_INSTALL_WITHOUT_MPICH2="$S_INTRODUCTION $S_UNPACK_LIBXML $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CHECK_AUTOTOOLS $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_CONFIGURE_LIBXML2_ENV $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END" -FULL_INSTALL_WITHOUT_LIBXML2_MPICH2="$S_INTRODUCTION $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END_WITHOUT_INFO" +FULL_INSTALL_WITHOUT_LIBXML2_MPICH2="$S_INTRODUCTION $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END_WITHOUT_INFO" # basic install BASIC_INSTALL="$S_INTRODUCTION $S_INSTALL_EO $S_INSTALL_MO $S_INSTALL_MOEO $S_END" # install only paradiseo-peo -PARALLEL_INSTALL="$S_PEO_CHECK $S_INTRODUCTION $S_UNPACK_LIBXML $S_CHECK_AUTOTOOLS $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_UNPACK_MPICH $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_ENV $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END" +PARALLEL_INSTALL="$S_PEO_CHECK $S_INTRODUCTION $S_UNPACK_LIBXML $S_CHECK_AUTOTOOLS $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_UNPACK_MPICH $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_ENV $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END" -PARALLEL_INSTALL_WITHOUT_LIBXML2="$S_PEO_CHECK $S_INTRODUCTION $S_UNPACK_MPICH $S_CHECK_AUTOTOOLS $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_MPICH_ENV $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END" +PARALLEL_INSTALL_WITHOUT_LIBXML2="$S_PEO_CHECK $S_INTRODUCTION $S_UNPACK_MPICH $S_CHECK_AUTOTOOLS $S_INSTALL_MPICH $S_REMOVE_TEMP_MPICH $S_CONFIGURE_MPICH_ENV $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END" -PARALLEL_INSTALL_WITHOUT_MPICH2="$S_PEO_CHECK $S_INTRODUCTION $S_CHECK_AUTOTOOLS $S_UNPACK_LIBXML $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_CONFIGURE_LIBXML2_ENV $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END" +PARALLEL_INSTALL_WITHOUT_MPICH2="$S_PEO_CHECK $S_INTRODUCTION $S_CHECK_AUTOTOOLS $S_UNPACK_LIBXML $S_INSTALL_LIBXML $S_REMOVE_TEMP_LIBXML $S_CONFIGURE_LIBXML2_ENV $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END" -PARALLEL_INSTALL_WITHOUT_LIBXML2_MPICH2="$S_PEO_CHECK $S_INTRODUCTION $S_INSTALL_PEO $S_CONFIGURE_MPD $S_END_WITHOUT_INFO" +PARALLEL_INSTALL_WITHOUT_LIBXML2_MPICH2="$S_PEO_CHECK $S_INTRODUCTION $S_CONFIGURE_MPD $S_INSTALL_PEO $S_END_WITHOUT_INFO" # remove a previous install RM_PREVIOUS_INSTALL="$S_REMOVE_INSTALL" #others LIBS_PATH=lib -LIBXML2_ARCHIVE=libxml2-2.6.0 -LIBXML2_ARCHIVE_SUFFIX=.tar.bz2 -MPICH2_ARCHIVE=mpich2-1.0.3 +LIBXML2_ARCHIVE=libxml2-2.7.3 +LIBXML2_ARCHIVE_SUFFIX=.tar.gz +MPICH2_ARCHIVE=mpich2-1.0.8 MPICH2_ARCHIVE_SUFFIX=.tar.gz # errors SUCCESSFUL_STEP=0 @@ -353,7 +353,7 @@ function run_install_step() execute_cmd "rm -Rf $installKitPath/$LIBXML2_ARCHIVE_SUFFIX" "[$currentStepCounter-1] Remove potential existing dir $installKitPath/$LIBXML2_ARCHIVE" $SPY RETURN=$? - execute_cmd "tar xvjf $resourceKitPath/$LIBS_PATH/$LIBXML2_ARCHIVE$LIBXML2_ARCHIVE_SUFFIX --directory $installKitPath" "[$currentStepCounter-2] Unpack Libxml2" $SPY + execute_cmd "tar xzvf $resourceKitPath/$LIBS_PATH/$LIBXML2_ARCHIVE$LIBXML2_ARCHIVE_SUFFIX --directory $installKitPath" "[$currentStepCounter-2] Unpack Libxml2" $SPY if [ ! "$?" = "0" ] then echo '' @@ -558,7 +558,7 @@ function run_install_step() execute_cmd "mkdir $installKitPath/libxml2" "[$currentStepCounter-1] Create libxml2 dir" $SPY RETURN=$? - execute_cmd "cd $installKitPath/libxml2-2.6.0/" "[$currentStepCounter-2] Go in libxml2-2.6.0 dir" $SPY + execute_cmd "cd $installKitPath/$LIBXML2_ARCHIVE/" "[$currentStepCounter-2] Go in $LIBXML2_ARCHIVE dir" $SPY RETURN=`expr $RETURN + $?` execute_cmd "./configure --prefix=$installKitPath/libxml2/ --exec-prefix=$installKitPath/libxml2/" "[$currentStepCounter-3] Run configure for libxml2" $SPY RETURN=`expr $RETURN + $?` @@ -588,7 +588,7 @@ function run_install_step() execute_cmd "mkdir $installKitPath/mpich2" "[$currentStepCounter-1] Create mpich2 dir" $SPY RETURN=$? - execute_cmd "cd $installKitPath/mpich2-1.0.3/" "[$currentStepCounter-2] Go in mpich2-1.0.3 dir" $SPY + execute_cmd "cd $installKitPath/$MPICH2_ARCHIVE/" "[$currentStepCounter-2] Go in $MPICH2_ARCHIVE dir" $SPY RETURN=`expr $RETURN + $?` execute_cmd "./configure --prefix=$installKitPath/mpich2/" "[$currentStepCounter-3] Run configure for mpich2" $SPY RETURN=`expr $RETURN + $?` @@ -613,11 +613,11 @@ function run_install_step() echo -e " \033[40m\033[1;34m# STEP $currentStepCounter \033[0m " echo ' --> Removing libxml2 temp install directory ...' - execute_cmd "rm -fr $installKitPath/libxml2-2.6.0" "[$currentStepCounter] Remove Libxml2 temporary directory" $SPY + execute_cmd "rm -fr $installKitPath/$LIBXML2_ARCHIVE" "[$currentStepCounter] Remove Libxml2 temporary directory" $SPY if [ ! "$?" = "0" ] then echo '' - echo " --> Error when removing $installKitPath/libxml2-2.6.0" + echo " --> Error when removing $installKitPath/$LIBXML2_ARCHIVE" echo -e ' \033[40m\033[1;33m### END ### \033[0m ' return $REMOVE_TEMP_DIRECTORY_ERROR else @@ -632,11 +632,11 @@ function run_install_step() echo -e " \033[40m\033[1;34m# STEP $currentStepCounter \033[0m " echo ' --> Removing mpich2 temp install directory ...' - execute_cmd "rm -fr $installKitPath/mpich2-1.0.3" "[$currentStepCounter] Remove Mpich2 temporary directory" $SPY + execute_cmd "rm -fr $installKitPath/$MPICH2_ARCHIVE" "[$currentStepCounter] Remove Mpich2 temporary directory" $SPY if [ ! "$?" = "0" ] then echo '' - echo " --> Error when removing $installKitPath/mpich2-1.0.3" + echo " --> Error when removing $installKitPath/$MPICH2_ARCHIVE" echo -e ' \033[40m\033[1;33m### END ### \033[0m ' return $REMOVE_TEMP_DIRECTORY_ERROR else @@ -776,48 +776,6 @@ function run_install_step() return $SUCCESSFUL_STEP fi ;; - $S_INSTALL_PEO) - ######## installing paradiseo-peo ########## - echo -e " \033[40m\033[1;34m# STEP $currentStepCounter \033[0m " - echo ' --> Installing Paradiseo-PEO. Please wait ...' - - if [ ! "$installKitPath" = "$resourceKitPath" ] - then - cp -Rf $resourceKitPath/paradiseo-peo/ $installKitPath/ - rm -Rf $installKitPath/paradiseo-peo/build/* - fi - - execute_cmd "cd $installKitPath/paradiseo-peo/build" "[$currentStepCounter-1] Go in Paradiseo-PEO dir" $SPY - RETURN=$? - - execute_cmd " echo \"cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS \"" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE" $SPY - cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE >> ${SPY} 2>> ${SPY} - RETURN=`expr $RETURN + $?` - - if [ "$COMPILE_PARADISEO" = "1" ] - then - execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-PEO using CTest" $SPY - LAST_RETURN=$? - # don't consider a submission error as a "right error" - if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ] - then - RETURN=`expr $RETURN + $LAST_RETURN` - fi - fi - - if [ ! $(($RETURN)) = 0 ] - then - echo '' - echo " --> Error when installing Paradiseo-PEO" - echo -e ' \033[40m\033[1;33m### END ### \033[0m ' - return $PARADISEO_INSTALL_ERROR - else - echo -e " \033[40m\033[1;34m# STEP $currentStepCounter OK \033[0m" - echo - return $SUCCESSFUL_STEP - fi - ;; - $S_CONFIGURE_MPD) ######## copy .mpd.conf file in your HOME directory or in /etc if you are root (required for mpich2) echo -e " \033[40m\033[1;34m# STEP $currentStepCounter \033[0m " @@ -848,6 +806,72 @@ function run_install_step() return $SUCCESSFUL_STEP fi ;; + $S_INSTALL_PEO) + ######## installing paradiseo-peo ########## + echo -e " \033[40m\033[1;34m# STEP $currentStepCounter \033[0m " + echo ' --> Installing Paradiseo-PEO. Please wait ...' + + #################################################### + ## Fichier d'installation revu par mahmoud FATENE ## + #################################################### + #if [ "$UID" = "0" ] + #then + # execute_cmd "source /root/.bashrc" "[$currentStepCounter-5] Export variables" $SPY + # RETURN=$? + #else + # execute_cmd "source $HOME/.bashrc" "[$currentStepCounter-5] Export variables" $SPY + # RETURN=$? + #fi + #if [ ! $(($RETURN)) = 0 ] + #then + # echo '' + # echo " --> Error on sourcing .bashrc " + # echo -e ' \033[40m\033[1;33m### END ### \033[0m ' + # return $SOURCE_ERROR + #else + # echo -e " \033[40m\033[1;34m# STEP $currentStepCounter OK \033[0m" + # echo + # return $SUCCESSFUL_STEP + #fi + # + #if [ ! "$installKitPath" = "$resourceKitPath" ] + # then + # cp -Rf $resourceKitPath/paradiseo-peo/ $installKitPath/ + # rm -Rf $installKitPath/paradiseo-peo/build/* + #fi + ####################################################### + ## Fin de la modification ## + ####################################################### + execute_cmd "source $HOME/.bashrc" "[$currentStepCounter-5] Export variables" $SPY + execute_cmd "cd $installKitPath/paradiseo-peo/build" "[$currentStepCounter-1] Go in Paradiseo-PEO dir" $SPY + RETURN=$? + execute_cmd " echo \"cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS \"" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE" $SPY + cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE >> ${SPY} 2>> ${SPY} + RETURN=`expr $RETURN + $?` + + if [ "$COMPILE_PARADISEO" = "1" ] + then + execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-PEO using CTest" $SPY + LAST_RETURN=$? + # don't consider a submission error as a "right error" + if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ] + then + RETURN=`expr $RETURN + $LAST_RETURN` + fi + fi + + if [ ! $(($RETURN)) = 0 ] + then + echo '' + echo " --> Error when installing Paradiseo-PEO" + echo -e ' \033[40m\033[1;33m### END ### \033[0m ' + return $PARADISEO_INSTALL_ERROR + else + echo -e " \033[40m\033[1;34m# STEP $currentStepCounter OK \033[0m" + echo + return $SUCCESSFUL_STEP + fi + ;; $S_PEO_CHECK) if [ -d paradiseo-eo -a -d paradiseo-mo -a -d paradiseo-moeo ] @@ -1232,9 +1256,9 @@ do echo echo -e ' \033[40m\033[1;33m### Please select your install for ParadisEO : ### \033[0m ' echo - echo " 1 : Full install (all the components : EO,MO,MOEO and PEO)" - echo " 2 : Basic install: only EO,MO and MOEO components will be installed." - echo " 3 : ParadisEO-PEO install. I've already installed the basic version and I want to install ParadisEO-PEO" + echo " 1 : Basic install: only EO,MO and MOEO components will be installed." + echo " 2 : ParadisEO-PEO install. I've already installed the basic version and I want to install ParadisEO-PEO" + echo " 3 : Full install (all the components : EO,MO,MOEO and PEO)" echo " 4 : Remove a previous install of ParadisEO located in $INSTALL_PATH" echo " 5 : Exit install" read INSTALL_TYPE diff --git a/branches/cmakemodif/paradiseo-peo/src/core/runner.cpp b/branches/cmakemodif/paradiseo-peo/src/core/runner.cpp index 54d07deea..a28fa98c4 100644 --- a/branches/cmakemodif/paradiseo-peo/src/core/runner.cpp +++ b/branches/cmakemodif/paradiseo-peo/src/core/runner.cpp @@ -35,6 +35,7 @@ */ #include +#include #include "runner.h" #include "reac_thread.h" @@ -106,17 +107,37 @@ void initializeContext () { num_local_exec_runners = 0; - + /* + std :: cout << " Hi, I'm thread number \t" << getNodeRank () << std::endl; + + int err_code = MPI_Barrier(MPI_COMM_WORLD); + if ( err_code != MPI_SUCCESS ) + { + std :: cout << " Synchronisation error code \t" << err_code << std::endl; + } + */ + + synchronizeNodes (); // setting up the execution IDs & counting the number of local exec. runners for (unsigned i = 0; i < the_runners.size (); i ++) { the_runners [i] -> setExecutionID ( my_node -> execution_id_run[ i ] ); if (the_runners [i] -> isAssignedLocally ()) num_local_exec_runners ++; } - + /* + std :: cout << " num_local_exec_runners \t" << num_local_exec_runners << std::endl; + std :: cout << " num_exec_runners \t" << num_exec_runners << std::endl; + */ + synchronizeNodes (); collectiveCountOfRunners( &num_local_exec_runners, &num_exec_runners ); - - // synchronizeNodes (); + /* + err_code = iCollectiveCountOfRunners( &num_local_exec_runners, &num_exec_runners ); + std :: cout << " Error code \t" << err_code << "\t MPI_SUCCESS\t " << MPI_SUCCESS << std::endl; + if ( err_code != MPI_SUCCESS ) + { + std :: cout << " Something strange in the neighbourhood \t" << err_code << std::endl; + } + */ for (unsigned i = 0; i < the_runners.size (); i ++) if (the_runners [i] -> isAssignedLocally ()) the_runners [i] -> notifyContextInitialized (); diff --git a/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.cpp b/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.cpp index 12e8a4194..23ab5b5a2 100644 --- a/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.cpp +++ b/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.cpp @@ -122,6 +122,13 @@ void collectiveCountOfRunners ( unsigned int* num_local_exec_runners, unsigned i MPI_Allreduce( num_local_exec_runners, num_exec_runners, 1, MPI_UNSIGNED, MPI_SUM, MPI_COMM_WORLD ); } +// Return the code of execution of MPI_Allreduce +int iCollectiveCountOfRunners ( unsigned int* num_local_exec_runners, unsigned int* num_exec_runners ) +{ + + return MPI_Allreduce( num_local_exec_runners, num_exec_runners, 1, MPI_UNSIGNED, MPI_SUM, MPI_COMM_WORLD ); +} + int getRankFromName (const std :: string & __name) { diff --git a/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.h b/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.h index 31327c7b0..e20ef6e2f 100644 --- a/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.h +++ b/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/node.h @@ -67,6 +67,8 @@ extern int getNumberOfNodes (); /* It gives the size of the environment (Total n extern void collectiveCountOfRunners ( unsigned int* num_local_exec_runners, unsigned int* num_exec_runners ); +extern int iCollectiveCountOfRunners ( unsigned int* num_local_exec_runners, unsigned int* num_exec_runners ); + extern int getRankFromName (const std :: string & __name); /* It gives the rank of the process expressed by its name */ diff --git a/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/schema.cpp b/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/schema.cpp index e43be84e8..29ac97b41 100644 --- a/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/schema.cpp +++ b/branches/cmakemodif/paradiseo-peo/src/rmc/mpi/schema.cpp @@ -34,10 +34,12 @@ * */ +#include #include #include #include "schema.h" +#include "mess.h" #include "xml_parser.h" #include "comm.h" #include "node.h" @@ -130,7 +132,8 @@ bool isScheduleNode () void loadSchema (const char * __filename) { - + + // std :: cout << " I'm node number \t" << getNodeRank () << std :: endl; openXMLDocument (__filename); std :: string name; @@ -204,4 +207,5 @@ void loadSchema (const char * __filename) } closeXMLDocument (); + //synchronizeNodes (); } diff --git a/branches/cmakemodif/paradiseo-peo/test/CMakeLists.txt b/branches/cmakemodif/paradiseo-peo/test/CMakeLists.txt index 3da04e9e1..12fefd0b8 100644 --- a/branches/cmakemodif/paradiseo-peo/test/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-peo/test/CMakeLists.txt @@ -74,27 +74,28 @@ ENDFOREACH (test) IF(ENABLE_MINIMAL_CMAKE_TESTING) - SET (MIN_TEST_LIST t-MultiStart) + + SET (MIN_TEST_LIST t-MultiStart) - FOREACH (testrun ${TEST_RUN}) + FOREACH (testrun ${TEST_RUN}) ADD_EXECUTABLE(${testrun} ${T_${testrun}_SOURCES}) ADD_TEST(${testrun} ${testrun}) ENDFOREACH (testrun) - FOREACH (mintest ${MIN_TEST_LIST}) + FOREACH (mintest ${MIN_TEST_LIST}) SET ("T_${mintest}_SOURCES" "${mintest}.cpp") ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) ADD_TEST(${mintest} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${mintest}" "@param") TARGET_LINK_LIBRARIES(${mintest} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) - ENDFOREACH (mintest) + ENDFOREACH (mintest) - FOREACH (teststop ${TEST_STOP}) + FOREACH (teststop ${TEST_STOP}) ADD_EXECUTABLE(${teststop} ${T_${teststop}_SOURCES}) ADD_TEST(${teststop} ${teststop}) - ENDFOREACH (teststop) + ENDFOREACH (teststop) ELSEIF(ENABLE_CMAKE_TESTING) - + FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP}) ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) ENDFOREACH (test) @@ -110,10 +111,10 @@ ELSEIF(ENABLE_CMAKE_TESTING) FOREACH (teststop ${TEST_STOP}) ADD_TEST(${teststop} ${teststop}) ENDFOREACH (teststop) - + FOREACH (test ${TEST_LIST}) TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) - ENDFOREACH (test) + ENDFOREACH (test) ENDIF(ENABLE_MINIMAL_CMAKE_TESTING) diff --git a/branches/cmakemodif/paradiseo-peo/test/schema.xml b/branches/cmakemodif/paradiseo-peo/test/schema.xml index 9b8bf316c..3edea1488 100644 --- a/branches/cmakemodif/paradiseo-peo/test/schema.xml +++ b/branches/cmakemodif/paradiseo-peo/test/schema.xml @@ -7,7 +7,6 @@ 1 - 2 diff --git a/branches/cmakemodif/paradiseo-peo/test/t-Mpdallexit.cpp b/branches/cmakemodif/paradiseo-peo/test/t-Mpdallexit.cpp index 57d4d66dd..3772c8e15 100644 --- a/branches/cmakemodif/paradiseo-peo/test/t-Mpdallexit.cpp +++ b/branches/cmakemodif/paradiseo-peo/test/t-Mpdallexit.cpp @@ -35,8 +35,9 @@ */ #include +#include int main (int __argc, char *__argv[]) { - system("mpdallexit"); + int success = system("mpdallexit"); } diff --git a/branches/cmakemodif/paradiseo-peo/test/t-Mpdboot.cpp b/branches/cmakemodif/paradiseo-peo/test/t-Mpdboot.cpp index 83b2637ac..01611baf5 100644 --- a/branches/cmakemodif/paradiseo-peo/test/t-Mpdboot.cpp +++ b/branches/cmakemodif/paradiseo-peo/test/t-Mpdboot.cpp @@ -35,8 +35,9 @@ */ #include +#include int main (int __argc, char *__argv[]) { - system("mpdboot"); + int success = system("mpdboot"); }