slurmray 3.6.0__py3-none-any.whl → 3.6.1__py3-none-any.whl

slurmray/RayLauncher.py

@@ -87,17 +87,19 @@ class RayLauncher:
             self.__write_python_script()
             self.script_file, self.job_name = self.__write_slurm_script()
 
-    def __call__(self, cancel_old_jobs: bool = True) -> Any:
+    def __call__(self, cancel_old_jobs: bool = True, serialize: bool = True) -> Any:
         """Launch the job and return the result
 
         Args:
             cancel_old_jobs (bool, optional): Cancel the old jobs. Defaults to True.
+            serialize (bool, optional): Serialize the function and the arguments. This should be set to False if the function is automatically called by the server. Defaults to True.
 
         Returns:
             Any: Result of the function
         """
         # Sereialize function and arguments
-        self.__serialize_func_and_args(self.func, self.args)
+        if serialize:
+            self.__serialize_func_and_args(self.func, self.args)
 
         if self.cluster:
             print("Cluster detected, running on cluster...")
@@ -168,13 +170,6 @@ class RayLauncher:
         """
         print("Serializing function and arguments...")
 
-        # Check if there is already a func.pkl and args.pkl file
-        if os.path.exists(
-            os.path.join(self.project_path, "func.pkl")
-        ) and os.path.exists(os.path.join(self.project_path, "args.pkl")):
-            print("Function and arguments already serialized.")
-            return
-
         # Pickle the function
         with open(os.path.join(self.project_path, "func.pkl"), "wb") as f:
             dill.dump(func, f)
@@ -312,6 +307,7 @@ class RayLauncher:
         subprocess.Popen(
             ["tail", "-f", os.path.join(self.project_path, "{}.log".format(job_name))]
         )
+        start_time = time.time()
         while True:
             time.sleep(0.25)
             if os.path.exists(
@@ -361,6 +357,12 @@ class RayLauncher:
                         node_list,
                     )
                 )[1:]
+
+                # Update the queue log
+                if time.time() - start_time > 60:
+                    start_time = time.time()
+                    print("Update time: {}".format(time.strftime("%H:%M:%S")))
+
                 if current_queue is None or current_queue != to_queue:
                     current_queue = to_queue
                     with open(queue_log_file, "w") as f:
@@ -559,13 +561,13 @@ if __name__ == "__main__":
     launcher = RayLauncher(
         project_name="example",  # Name of the project (will create a directory with this name in the current directory)
         func=example_func,  # Function to execute
-        args={"x": 1},  # Arguments of the function
+        args={"x": 5},  # Arguments of the function
         files=[
             "slurmray/RayLauncher.py"
         ],  # List of files to push to the cluster (file path will be recreated on the cluster)
         modules=[],  # List of modules to load on the curnagl Cluster (CUDA & CUDNN are automatically added if use_gpu=True)
         node_nbr=1,  # Number of nodes to use
-        use_gpu=False,  # If you need A100 GPU, you can set it to True
+        use_gpu=True,  # If you need A100 GPU, you can set it to True
         memory=8,  # In MegaBytes
         max_running_time=5,  # In minutes
         runtime_env={

slurmray/assets/slurmray_server_template.py

@@ -16,4 +16,4 @@ if __name__ == "__main__":
         server_username=None,
     )
 
-    result = launcher()
+    result = launcher(serialize=False)

{slurmray-3.6.0.dist-info → slurmray-3.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slurmray
-Version: 3.6.0
+Version: 3.6.1
 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.6.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+slurmray/RayLauncher.py,sha256=KfmlTBqfv3KFe1Kyk1n6lEZwJfLnZKQxKKpKlRNAre8,23452
+slurmray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+slurmray/assets/sbatch_template.sh,sha256=c-7J4ItzrctDrbF5Znu8p1d_xIgayC9puhjX3nLMzsk,2273
+slurmray/assets/slurmray_server.sh,sha256=-PpX3AitLVfAYjyNqE3BjtDu5uvk11KoiaCUVgmtcEQ,1506
+slurmray/assets/slurmray_server_template.py,sha256=JwX2pH7K9pb10JuRxe3EsjSUp1t3xm0ojEh8H2W2lVo,461
+slurmray/assets/spython_template.py,sha256=kRUvNQs9iCcg0wJLmm9LV0TnbUdlenZMYPr_bZPkXLg,597
+slurmray-3.6.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+slurmray-3.6.1.dist-info/METADATA,sha256=kqs_CKzsLCACuKE67WdILR7LosGAtTRe-xDez-Trozk,3530
+slurmray-3.6.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+slurmray-3.6.1.dist-info/RECORD,,

slurmray-3.6.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-slurmray/RayLauncher.py,sha256=3pOOMGDENspcfHiEaxWoyLx6Wep5XHItRBuSXJ3cUvI,23279
-slurmray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-slurmray/assets/sbatch_template.sh,sha256=c-7J4ItzrctDrbF5Znu8p1d_xIgayC9puhjX3nLMzsk,2273
-slurmray/assets/slurmray_server.sh,sha256=-PpX3AitLVfAYjyNqE3BjtDu5uvk11KoiaCUVgmtcEQ,1506
-slurmray/assets/slurmray_server_template.py,sha256=PF4Rl3TrTS8hI0jbCMlOuRmICkL_OucO6R-uKq83kvg,446
-slurmray/assets/spython_template.py,sha256=kRUvNQs9iCcg0wJLmm9LV0TnbUdlenZMYPr_bZPkXLg,597
-slurmray-3.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-slurmray-3.6.0.dist-info/METADATA,sha256=VrDOXUE4gBXscmducVlQ2pqzEl2kV0kRO9pBKO-gWQM,3530
-slurmray-3.6.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-slurmray-3.6.0.dist-info/RECORD,,