From 0b37afd1fa3b9916fd9137c24f0c98d42c7ecca5 Mon Sep 17 00:00:00 2001 From: ribes Date: Wed, 10 Feb 2010 15:34:19 +0000 Subject: [PATCH] - Better clean_configure with libtool > 2 - Parallel compilation with PaCO++ - Better Catalog Resource generation --- clean_configure | 1 + idl/Makefile.am | 2 +- src/Launcher/Launcher_Job_SALOME.cxx | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/clean_configure b/clean_configure index 9fe037eae..3618c211c 100755 --- a/clean_configure +++ b/clean_configure @@ -32,6 +32,7 @@ cd $libdir # Files created by libtoolize rm -f config.guess config.sub ltmain.sh rm -f mdate-sh texinfo.tex +rm -f lt~obsolete.m4 ltversion.m4 ltsugar.m4 ltoptions.m4 libtool.m4 # Files created by automake rm -rf install-sh missing compile depcomp py-compile cd $here diff --git a/idl/Makefile.am b/idl/Makefile.am index c28424985..57e246b7f 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -217,7 +217,7 @@ idldir = $(prefix)/idl/salome nodist_idl_DATA = ${XML} ${IDL_PACO} Calcium_Ports.idl nodist_salomeinclude_HEADERS = ${INCLUDES_PACO} -BUILT_SOURCES = $(IDL_SOURCES) $(PAR) $(PAR_INCLUDES) +BUILT_SOURCES = $(IDL_SOURCES) $(PAR_INCLUDES) $(PAR) SALOME_ComponentPaCO.idl SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx : SALOME_Component.idl SALOME_Component.xml SALOME_PortsPaCO.idl SALOME_PortsPaCO.hxx SALOME_PortsPaCO.cxx : SALOME_Ports.idl SALOME_Ports.xml diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx index b63449930..9a3d8c8ab 100644 --- a/src/Launcher/Launcher_Job_SALOME.cxx +++ b/src/Launcher/Launcher_Job_SALOME.cxx @@ -80,13 +80,16 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params) launch_script_stream << "export USER_CATALOG_RESOURCES_FILE=" << "$CATALOG_FILE" << std::endl; launch_script_stream << "echo '' > $CATALOG_FILE" << std::endl; launch_script_stream << "echo '' >> $CATALOG_FILE" << std::endl; - launch_script_stream << "cat $LIBBATCH_NODEFILE | sort -u | while read host" << std::endl; + launch_script_stream << "cat $LIBBATCH_NODEFILE | sort | uniq -c | while read nbproc host" << std::endl; launch_script_stream << "do" << std::endl; - launch_script_stream << "echo '> $CATALOG_FILE" << std::endl; launch_script_stream << "echo ' userName=\"" << _resource_definition.UserName << "\"' >> $CATALOG_FILE" << std::endl; launch_script_stream << "echo ' appliPath=\"" << _resource_definition.AppliPath << "\"' >> $CATALOG_FILE" << std::endl; - launch_script_stream << "echo '/>' >> $CATALOG_FILE" << std::endl; + launch_script_stream << "echo ' mpi=\"" << _resource_definition.PrintMpiImplType() << "\"' >> $CATALOG_FILE" << std::endl; + launch_script_stream << "echo ' nbOfNodes='\\\"$nbproc\\\" >> $CATALOG_FILE" << std::endl; + launch_script_stream << "echo ' nbOfProcPerNode=\"1\"' >> $CATALOG_FILE" << std::endl; + launch_script_stream << "echo '/>' >> $CATALOG_FILE" << std::endl; launch_script_stream << "done" << std::endl; launch_script_stream << "echo '' >> $CATALOG_FILE" << std::endl; launch_script_stream << "fi" << std::endl; -- 2.39.2