improvement to use Salome application

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 3aa89538033d095067a002d08864e8c125b7e55c..aa958bdc1f05dc872d419ec807689b7562550410 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -148,6 +148,7 @@ SALOME_ContainerManagerServer_CPPFLAGS=\
 SALOME_ContainerManagerServer_LDADD =\
        libSalomeContainer.la \
        $(COMMON_LIBS) \
-       ../Basics/libSALOMEBasics.la
+       ../Basics/libSALOMEBasics.la \
        ../Batch/libSalomeBatch.la
 
+

diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx
index 0acec7e1c48f67669b7b304fbbf8489540dcb5e0..ec4bef59f149f2fee61d0c9e018efb961c183ee3 100644 (file)
--- a/src/Container/SALOME_ContainerManager.cxx
+++ b/src/Container/SALOME_ContainerManager.cxx
@@ -327,10 +327,10 @@ GiveContainer(const Engines::MachineParameters& params,
  *  \param params             : Constraints for the choice of the batch cluster
  */
 //=============================================================================
-long SALOME_ContainerManager::batchSalomeJob(
+CORBA::Long SALOME_ContainerManager::batchSalomeJob(
                             const char * fileToExecute ,
                             const Engines::FilesToExportList& filesToExport ,
-                            const long NumberOfProcessors ,
+                            const CORBA::Long NumberOfProcessors ,
                             const Engines::MachineParameters& params)
 {
   BEGIN_OF("SALOME_ContainerManager::batchSalomeJob");

diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx
index 4bacf2c341fa2f748d8e7a5a358d8f15f67444d7..90ba170a75e7fad7b8b4ae61e837af97e67f71c4 100644 (file)
--- a/src/Container/SALOME_ContainerManager.hxx
+++ b/src/Container/SALOME_ContainerManager.hxx
@@ -72,9 +72,9 @@ public:
                Engines::ResPolicy policy,
                const Engines::CompoList& componentList);
 
-  long batchSalomeJob(const char * fileToExecute ,
+  CORBA::Long batchSalomeJob(const char * fileToExecute ,
                       const Engines::FilesToExportList& filesToExport ,
-                      const long NumberOfProcessors ,
+                     const CORBA::Long NumberOfProcessors ,
                       const Engines::MachineParameters& params);
 
   Engines::MachineList *

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d6b7fa897608bcd585b2e04a8b2995deeabd5ce..010d8fcd62a999e026354d77bcd818433cacaf9d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,10 @@ DIST_SUBDIRS = \
 
 SUBDIRS = $(SUBDIR_BASE)
 
+if WITH_BATCH
+  SUBDIRS += $(SUBDIR_BATCH)
+endif
+
 if CORBA_GEN
   SUBDIRS += $(SUBDIR_CORBA)
 endif
@@ -104,10 +108,6 @@ if MPI_IS_OK
   SUBDIRS += $(SUBDIR_MPI)
 endif
 
-if WITH_BATCH
-  SUBDIRS += $(SUBDIR_BATCH)
-endif
-
 if CPPUNIT_IS_OK
 if CORBA_GEN
   SUBDIRS += \

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index fee0979012d853a5394fdb7a6739a252b081e5e4..6e4b446db09e1143d2c6e8672d84e107c76e1b1a 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -617,26 +617,29 @@ std::string SALOME_ResourcesManager::BuildCmdrunSalomeBatch(
   const ParserResourcesType& resInfo = _resourcesList[machine];
   resInfo.Print() ;
   tempOutputFile << "#! /bin/sh -f" << endl ;
-  tempOutputFile << "source " ;
+  tempOutputFile << "cd " ;
   tempOutputFile << resInfo.AppliPath << endl ;
   tempOutputFile << "export PYTHONPATH=" ;
   tempOutputFile << DirForTmpFiles ;
   tempOutputFile << ":$PYTHONPATH" << endl ;
   tempOutputFile << "if test $SLURM_PROCID = 0; then" << endl ;
-  tempOutputFile << "    runSalome --terminal --batch --modules=" ;
+  tempOutputFile << "  ./runAppli --terminal --batch --modules=" ;
   int i ;
   for ( i = 0 ; i < resInfo.ModulesList.size() ; i++ ) {
     tempOutputFile << resInfo.ModulesList[i] ;
     if ( i != resInfo.ModulesList.size()-1 )
       tempOutputFile << "," ;
   }
-  tempOutputFile << " --standalone=registry,study,moduleCatalog --execute=" ;
-  tempOutputFile << FileNameToExecute ;
-  tempOutputFile << ",killall --killall" << endl ;
+  tempOutputFile << " --standalone=registry,study,moduleCatalog --killall &" << endl ;
+  tempOutputFile << "  for ((ip=1; ip < ${SLURM_NPROCS} ; ip++))" << endl;
+  tempOutputFile << "  do" << endl ;
+  tempOutputFile << "    arglist=\"$arglist YACS_Server_\"$ip" << endl ;
+  tempOutputFile << "  done" << endl ;
+  tempOutputFile << "  ./runSession waitContainers.sh $arglist" << endl ;
+  tempOutputFile << "  ./runSession python " << DirForTmpFiles << "/" << FileNameToExecute << ".py" << endl;
   tempOutputFile << "else" << endl ;
-  tempOutputFile << "    sleep 10" << endl ;
-  tempOutputFile << "    export SALOME_BATCH='1'" << endl ;
-  tempOutputFile << "    SALOME_Container 'YACS_Server_'${SLURM_PROCID}" << endl ;
+  tempOutputFile << "  ./runSession waitNS.py" << endl ;
+  tempOutputFile << "  ./runSession SALOME_Container 'YACS_Server_'${SLURM_PROCID}" << endl ;
   tempOutputFile << "fi" << endl ;
   tempOutputFile.flush();
   tempOutputFile.close();