From: Konstantin Leontev <Konstantin.LEONTEV@opencascade.com>
Date: Fri, 11 Aug 2023 10:40:13 +0000 (+0100)
Subject: [bos #35138][EDF] (2023-T1) Specialization of resources in KERNEL. JobParameters... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fkleontev%2F35138_specialization_resources_in_KERNEL;p=modules%2Fjobmanager.git

[bos #35138][EDF] (2023-T1) Specialization of resources in KERNEL. JobParameters resource_required type changed to ResourceParametersJob.
---

diff --git a/src/engine/BL_SALOMEServices.cxx b/src/engine/BL_SALOMEServices.cxx
index a2540b9..293afa4 100644
--- a/src/engine/BL_SALOMEServices.cxx
+++ b/src/engine/BL_SALOMEServices.cxx
@@ -413,8 +413,6 @@ BL::SALOMEServices::create_job(BL::Job * job)
   // Resource
   job_parameters->maximum_duration = CORBA::string_dup(cpp_batch_params.maximum_duration.c_str());
   job_parameters->resource_required.name = CORBA::string_dup(job->getResource().c_str());
-  job_parameters->resource_required.nb_proc = cpp_batch_params.nb_proc;
-  job_parameters->resource_required.nb_node = cpp_batch_params.nb_node;
   job_parameters->queue = CORBA::string_dup(job->getBatchQueue().c_str());
   job_parameters->partition = CORBA::string_dup(job->getBatchPartition().c_str());
   job_parameters->exclusive = cpp_batch_params.exclusive;
@@ -425,21 +423,15 @@ BL::SALOMEServices::create_job(BL::Job * job)
   switch (cpp_batch_params.mem_req_type)
   {
   case BL::Job::MEM_PER_NODE:
-    job_parameters->resource_required.mem_mb = cpp_batch_params.mem_limit;
     job_parameters->mem_per_cpu = 0;
     break;
   case BL::Job::MEM_PER_CPU:
-    job_parameters->resource_required.mem_mb = 0;
     job_parameters->mem_per_cpu = cpp_batch_params.mem_limit;
     break;
   default:
     throw Exception("Unknown memory requirement, unable to create job");
   }
 
-  // Unused parameters
-  job_parameters->resource_required.nb_proc_per_node = -1;
-  job_parameters->resource_required.cpu_clock = -1;
-
   // Parameters for COORM
   job_parameters->launcher_file = CORBA::string_dup(cpp_batch_params.launcher_file.c_str());
   job_parameters->launcher_args = CORBA::string_dup(cpp_batch_params.launcher_args.c_str());
@@ -735,8 +727,6 @@ BL::SALOMEServices::get_new_job(int job_number)
     BL::Job::BatchParam batch_param;
     batch_param.batch_directory = job_parameters->work_directory.in();
     batch_param.maximum_duration = job_parameters->maximum_duration.in();
-    batch_param.nb_proc = job_parameters->resource_required.nb_proc;
-    batch_param.nb_node = job_parameters->resource_required.nb_node;
     batch_param.exclusive = job_parameters->exclusive;
 
     if (job_parameters->mem_per_cpu != 0)
@@ -746,7 +736,6 @@ BL::SALOMEServices::get_new_job(int job_number)
     }
     else
     {
-      batch_param.mem_limit = job_parameters->resource_required.mem_mb;
       batch_param.mem_req_type = BL::Job::MEM_PER_NODE;
     }