-// Copyright (C) 2009-2019 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2009-2021 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
launch_script_stream << "export SALOME_TMP_DIR=" << work_directory << "/logs" << std::endl;
// -- Generates Catalog Resources
- std::string resource_protocol = _resource_definition.getClusterInternalProtocolStr();
- launch_script_stream << "if [ \"x$LIBBATCH_NODEFILE\" != \"x\" ]; then " << std::endl;
- launch_script_stream << "CATALOG_FILE=" << "CatalogResources_" << _launch_date << ".xml" << std::endl;
- launch_script_stream << "export USER_CATALOG_RESOURCES_FILE=" << "$CATALOG_FILE" << std::endl;
- launch_script_stream << "{" << std::endl;
- launch_script_stream << "echo '<!DOCTYPE ResourcesCatalog>'" << std::endl;
- launch_script_stream << "echo '<resources>'" << std::endl;
- launch_script_stream << "sort \"$LIBBATCH_NODEFILE\" | uniq -c | while read nbproc host" << std::endl;
- launch_script_stream << "do" << std::endl;
- // Full name doesn't work. eg: sagittaire-7 instead of sagittaire-7.lyon.grid5000.fr
- launch_script_stream << "host_basename=$(echo \"$host\" | cut -f1 -d.)" << std::endl;
- launch_script_stream << "echo '<machine name='\\\"\"$host_basename\"\\\"" << std::endl;
- launch_script_stream << "echo ' hostname='\\\"\"$host_basename\"\\\"" << std::endl;
- launch_script_stream << "echo ' type=\"single_machine\"'" << std::endl;
- launch_script_stream << "echo ' protocol=\"" << resource_protocol << "\"'" << std::endl;
- launch_script_stream << "echo ' userName=\"" << _resource_definition.UserName << "\"'" << std::endl;
- launch_script_stream << "echo ' appliPath=\"" << _resource_definition.AppliPath << "\"'" << std::endl;
- launch_script_stream << "echo ' mpi=\"" << _resource_definition.getMpiImplTypeStr() << "\"'" << std::endl;
- launch_script_stream << "echo ' nbOfNodes='\\\"\"$nbproc\"\\\"" << std::endl;
- launch_script_stream << "echo ' nbOfProcPerNode=\"1\"'" << std::endl;
- launch_script_stream << "echo ' canRunContainers=\"true\"'" << std::endl;
- launch_script_stream << "echo '/>'" << std::endl;
- launch_script_stream << "done" << std::endl;
- launch_script_stream << "echo '</resources>'" << std::endl;
- launch_script_stream << "} > $CATALOG_FILE" << std::endl;
- launch_script_stream << "fi" << std::endl;
-
+ // do not build a new catalog if the job is launched on localhost
+ if(_resource_required_params.name != "localhost")
+ {
+ std::string resource_protocol = _resource_definition.getClusterInternalProtocolStr();
+ launch_script_stream << "if [ \"x$LIBBATCH_NODEFILE\" != \"x\" ]; then " << std::endl;
+ launch_script_stream << "CATALOG_FILE=" << "CatalogResources_" << _launch_date << ".xml" << std::endl;
+ launch_script_stream << "export USER_CATALOG_RESOURCES_FILE=" << "$CATALOG_FILE" << std::endl;
+ launch_script_stream << "{" << std::endl;
+ launch_script_stream << "echo '<!DOCTYPE ResourcesCatalog>'" << std::endl;
+ launch_script_stream << "echo '<resources>'" << std::endl;
+ launch_script_stream << "sort \"$LIBBATCH_NODEFILE\" | uniq -c | while read nbproc host" << std::endl;
+ launch_script_stream << "do" << std::endl;
+ // Full name doesn't work. eg: sagittaire-7 instead of sagittaire-7.lyon.grid5000.fr
+ launch_script_stream << "host_basename=$(echo \"$host\" | cut -f1 -d.)" << std::endl;
+ launch_script_stream << "echo '<machine name='\\\"\"$host_basename\"\\\"" << std::endl;
+ launch_script_stream << "echo ' hostname='\\\"\"$host_basename\"\\\"" << std::endl;
+ launch_script_stream << "echo ' type=\"single_machine\"'" << std::endl;
+ launch_script_stream << "echo ' protocol=\"" << resource_protocol << "\"'" << std::endl;
+ launch_script_stream << "echo ' userName=\"" << _resource_definition.UserName << "\"'" << std::endl;
+ launch_script_stream << "echo ' appliPath=\"" << _resource_definition.AppliPath << "\"'" << std::endl;
+ launch_script_stream << "echo ' mpi=\"" << _resource_definition.getMpiImplTypeStr() << "\"'" << std::endl;
+ launch_script_stream << "echo ' nbOfNodes='\\\"\"$nbproc\"\\\"" << std::endl;
+ launch_script_stream << "echo ' nbOfProcPerNode=\"1\"'" << std::endl;
+ launch_script_stream << "echo ' canRunContainers=\"true\"'" << std::endl;
+ launch_script_stream << "echo '/>'" << std::endl;
+ launch_script_stream << "done" << std::endl;
+ launch_script_stream << "echo '</resources>'" << std::endl;
+ launch_script_stream << "} > $CATALOG_FILE" << std::endl;
+ launch_script_stream << "fi" << std::endl;
+ }
// Create file for ns-port-log
if (is_launcher_file)
- // for a salome application file, we write NS_PORT_FILE_PATH in launch_tmp_dir
- launch_script_stream << "NS_PORT_FILE_PATH=$(mktemp " << launch_tmp_dir << "nsport_XXXXXX) &&\n";
+ // for a salome application file, we write NS_PORT_FILE_PATH in working directory
+ launch_script_stream << "NS_PORT_FILE_PATH=$(mktemp " << work_directory << "/nsport_" << _launch_date << "_XXXXXX) &&\n";
else
launch_script_stream << "NS_PORT_FILE_PATH=$(mktemp " << _resource_definition.AppliPath << "/USERS/nsport_XXXXXX) &&\n";