slurmray 3.3.2__tar.gz → 3.5.0__tar.gz

{slurmray-3.3.2 → slurmray-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slurmray
-Version: 3.3.2
+Version: 3.5.0
 Summary: SlurmRay is a module for effortlessly distributing tasks on a Slurm cluster using the Ray library. 
 Home-page: https://henri-jamet.vercel.app/
 License: Apache License

{slurmray-3.3.2 → slurmray-3.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slurmray"
-version = "3.3.2"
+version = "3.5.0"
 description = "SlurmRay is a module for effortlessly distributing tasks on a Slurm cluster using the Ray library. "
 authors = ["Henri Jamet <henri.jamet@unil.ch>"]
 license = "Apache License"

{slurmray-3.3.2 → slurmray-3.5.0}/slurmray/RayLauncher.py

@@ -132,10 +132,17 @@ class RayLauncher:
         # Determine the path to the file
         local_path = file_path
         local_path_from_pwd = os.path.relpath(local_path, self.pwd_path)
-        cluster_path = os.path.join("/users", self.server_username, "slurmray-server", ".slogs", "server", local_path_from_pwd)
+        cluster_path = os.path.join("/users", self.server_username, "slurmray-server", local_path_from_pwd)
         
         # Create the directory if not exists
-        ssh_client.exec_command(f"mkdir -p '{os.path.dirname(cluster_path)}'")
+        
+        stdin, stdout, stderr = ssh_client.exec_command(f"mkdir -p '{os.path.dirname(cluster_path)}'")
+        while True:
+            line = stdout.readline()
+            if not line:
+                break
+            print(line, end="")
+        time.sleep(1) # Wait for the directory to be created
         
         # Copy the file to the server
         sftp.put(file_path, cluster_path)
@@ -411,10 +418,11 @@ class RayLauncher:
             # Add slurmray --pre
             lines.append("slurmray --pre")
             # Adapt torch version
-            lines = [re.sub(r'\ntorch==.*', 'torch', line) for line in lines]
-            lines = [re.sub(r'\ntorchvision==.*', 'torchvision', line) for line in lines]
-            lines = [re.sub(r'\ntorchaudio==.*', 'torchaudio', line) for line in lines]
-            lines = [re.sub(r'\nbitsandbytes==.*', 'bitsandbytes', line) for line in lines]
+            lines = [re.sub(r'\ntorch==.*', '`\ntorch', line) for line in lines]
+            lines = [re.sub(r'\ntorchvision==.*', '\ntorchvision', line) for line in lines]
+            lines = [re.sub(r'\ntorchaudio==.*', '\ntorchaudio', line) for line in lines]
+            lines = [re.sub(r'\nbitsandbytes==.*', '\nbitsandbytes', line) for line in lines]
+            lines = [re.sub(r'\nslurmray==.*', '\n', line) for line in lines]
             
         with open(f"{self.project_path}/requirements.txt", 'w') as file:
             file.writelines(lines)