From 375b2ba3cca1435295b855d432d71963c280cc62 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Tue, 14 May 2024 13:50:51 +0200
Subject: [PATCH 1/2] test

---
 autosubmit/platforms/slurmplatform.py            | 7 +++++--
 autosubmit/platforms/wrappers/wrapper_factory.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/autosubmit/platforms/slurmplatform.py b/autosubmit/platforms/slurmplatform.py
index 67c073a75..ca4ae4e52 100644
--- a/autosubmit/platforms/slurmplatform.py
+++ b/autosubmit/platforms/slurmplatform.py
@@ -417,7 +417,7 @@ class SlurmPlatform(ParamikoPlatform):
                 else:
                     job.new_status = Status.HELD
     @staticmethod
-    def wrapper_header(filename, queue, project, wallclock, num_procs, dependency, directives, threads, method="asthreads"):
+    def wrapper_header(filename, queue, project, wallclock, num_procs, dependency, directives, threads, method="asthreads",language="python3"):
         if method == 'srun':
             language = "#!/bin/bash"
             return \
@@ -441,7 +441,10 @@ class SlurmPlatform(ParamikoPlatform):
                 """.format(filename, queue, project, wallclock, num_procs, dependency,
                            '\n'.ljust(13).join(str(s) for s in directives), threads)
         else:
-            language = "#!/usr/bin/env python2"
+            if language.lower() == "python" or language.lower() == "python3":
+                language = "#!/usr/bin/env python3"
+            else:
+                language = "#!/usr/bin/env python2"
             return \
                 language + """
 ###############################################################################
diff --git a/autosubmit/platforms/wrappers/wrapper_factory.py b/autosubmit/platforms/wrappers/wrapper_factory.py
index 7883ede2b..d9ee125b3 100644
--- a/autosubmit/platforms/wrappers/wrapper_factory.py
+++ b/autosubmit/platforms/wrappers/wrapper_factory.py
@@ -34,9 +34,9 @@ class WrapperFactory(object):
         kwargs['allocated_nodes'] = self.allocated_nodes()
         kwargs['dependency'] = self.dependency(kwargs['dependency'])
         kwargs['queue'] = self.queue(kwargs['queue'])
+        kwargs['language'] = self.configuration.get_wrapper_language()
         kwargs['header_directive'] = self.header_directives(**kwargs)
         kwargs['configuration'] = self.configuration
-        kwargs['language'] = self.configuration.get_wrapper_language()
         builder = wrapper_builder(**kwargs)
         return self.wrapper_director.construct(builder)
 
-- 
GitLab


From 3ea63a178ab0a22524be6dea95d1c725fd25a148 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Tue, 14 May 2024 16:28:20 +0200
Subject: [PATCH 2/2] fix

---
 autosubmit/job/job.py                     | 4 +++-
 autosubmit/platforms/paramiko_platform.py | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index efe337d0b..989ce97d1 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -1113,8 +1113,10 @@ class Job(object):
         if self.hyperthreading is 'none':
             self.hyperthreading = str(job_platform.hyperthreading).lower()
 
-        if self.tasks == '0' and job_platform.processors_per_node:
+        if int(self.tasks) <= 1 < int(job_platform.processors_per_node) and int(
+                self.processors) > int(job_platform.processors_per_node):
             self.tasks = job_platform.processors_per_node
+        self.tasks = str(self.tasks)
         self.memory = as_conf.get_memory(self.section)
         self.memory_per_task = as_conf.get_memory_per_task(self.section)
         self.wallclock = as_conf.get_wallclock(self.section)
diff --git a/autosubmit/platforms/paramiko_platform.py b/autosubmit/platforms/paramiko_platform.py
index 44a8dde1e..dcad9cdeb 100644
--- a/autosubmit/platforms/paramiko_platform.py
+++ b/autosubmit/platforms/paramiko_platform.py
@@ -946,11 +946,9 @@ class ParamikoPlatform(Platform):
                     self._ssh_output += s
             for errorLineCase in stderr_readlines:
                 self._ssh_output_err += errorLineCase
-            # if self._bashrc_output matchs the start of self.ssh_output, then strip it from self.ssh_output
-            if self._ssh_output.startswith(self.bashrc_output):
-                self._ssh_output = self._ssh_output[len(self.bashrc_output):]
-            if self._ssh_output_err.startswith(self.bashrc_err):
-                self._ssh_output_err = self._ssh_output_err[len(self.bashrc_err):]
+            self._ssh_output = self._ssh_output.replace(self.bashrc_output, "")
+            self._ssh_output_err = self._ssh_output_err.replace(self.bashrc_err, "")
+
             if "not active" in self._ssh_output_err:
                 raise AutosubmitError(
                     'SSH Session not active, will restart the platforms', 6005)
-- 
GitLab