slurmray 2.2.0__tar.gz → 2.4.0__tar.gz

{slurmray-2.2.0 → slurmray-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slurmray
-Version: 2.2.0
+Version: 2.4.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
@@ -10,6 +10,7 @@ Requires-Python: ==3.9.13
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: dill (>=0.3.7,<0.4.0)
+Requires-Dist: pdoc3 (>=0.10.0,<0.11.0)
 Requires-Dist: ray[data,serve,train,tune] (>=2.7.1,<3.0.0)
 Project-URL: Documentation, https://henri-jamet.vercel.app/cards/documentation/slurm-ray/slurm-ray/
 Description-Content-Type: text/markdown

{slurmray-2.2.0 → slurmray-2.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slurmray"
-version = "2.2.0"
+version = "2.4.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"
@@ -12,6 +12,7 @@ readme = "README.md"
 python = "3.9.13"
 dill = "^0.3.7"
 ray = {extras = ["data", "serve", "train", "tune"], version = "^2.7.1"}
+pdoc3 = "^0.10.0"
 
 
 [build-system]

{slurmray-2.2.0 → slurmray-2.4.0}/slurmray/RayLauncher.py

@@ -53,7 +53,7 @@ class RayLauncher:
             raise ValueError("memory must be an int")
         if not isinstance(max_running_time, int):
             raise ValueError("max_running_time must be an int")
-        
+
         # Save the parameters
         self.project_name = project_name
         self.func = func
@@ -73,7 +73,7 @@ class RayLauncher:
         self.cluster = os.path.exists("/usr/bin/sbatch")
 
         # Create the project directory if not exists
-        self.pwd_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
+        self.pwd_path = os.path.join(os.path.dirname(os.path.abspath(__file__)))
         self.project_path = os.path.join(self.pwd_path, "logs", self.project_name)
         if not os.path.exists(self.project_path):
             os.makedirs(self.project_path)
@@ -150,7 +150,9 @@ class RayLauncher:
             dill.dump(args, f)
 
         # Write the python script
-        with open(os.path.join(self.pwd_path, "slurmray", "assets", "spython_template.py"), "r") as f:
+        with open(
+            os.path.join(self.pwd_path, "assets", "spython_template.py"), "r"
+        ) as f:
             text = f.read()
 
         text = text.replace("{{PROJECT_PATH}}", f'"{self.project_path}"')
@@ -159,8 +161,8 @@ class RayLauncher:
             str(
                 f""
                 if not self.cluster
-                else "\n\taddress='auto'\n\tinclude_dashboard=True,\n\tdashboard_host='0.0.0.0',\n\tdashboard_port=8888,\n"
-            ) + "num_gpus=1" if self.use_gpu is True else "",
+                else "\n\taddress='auto',\n\tinclude_dashboard=True,\n\tdashboard_host='0.0.0.0',\n\tdashboard_port=8888,\n"
+            ),
         )
         with open(os.path.join(self.project_path, "spython.py"), "w") as f:
             f.write(text)
@@ -175,7 +177,7 @@ class RayLauncher:
             str: Name of the job
         """
         print("Writing slurm script...")
-        template_file = os.path.join(self.pwd_path, "slurmray", "assets", "sbatch_template.sh")
+        template_file = os.path.join(self.pwd_path, "assets", "sbatch_template.sh")
 
         JOB_NAME = "{{JOB_NAME}}"
         NUM_NODES = "{{NUM_NODES}}"
@@ -332,7 +334,6 @@ class RayLauncher:
         print("Job finished!")
 
 
-
 # ---------------------------------------------------------------------------- #
 #                             EXAMPLE OF EXECUTION                             #
 # ---------------------------------------------------------------------------- #