Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions matrix/cluster/ray_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import typing as tp
from pathlib import Path

import clusterscope

from matrix.common import JOB_MANAGER_STORE
from matrix.common.cluster_info import ClusterInfo
from matrix.utils.basics import convert_to_json_compatible
Expand Down Expand Up @@ -242,7 +244,14 @@ def start(
folder=str(self._log_dir),
cluster=executor,
)
default_params = {"cpus_per_task": 20, "timeout_min": 10080}
default_params = {"timeout_min": 10080, "cpus_per_task": 20}
if executor == "slurm":
# clusterscope assigns the proportionate amount of resources based on gpus/cpus being requested.
resources = clusterscope.job_gen_task_slurm(
partition=str(requirements["partition"]),
cpus_per_task=default_params["cpus_per_task"],
)
default_params["mem_gb"] = resources["mem_gb"]
if add_workers == 0:
head_params = requirements
else:
Expand Down Expand Up @@ -308,10 +317,18 @@ def start(
)
default_params = {
"ntasks_per_node": 1,
"cpus_per_task": 96,
"timeout_min": 10080,
"gpus_per_node": 8,
}
if executor == "slurm":
# clusterscope assigns the proportionate amount of resources based on gpus/cpus being requested.
resources = clusterscope.job_gen_task_slurm(
partition=str(requirements["partition"]),
gpus_per_task=default_params["gpus_per_node"],
tasks_per_node=default_params["ntasks_per_node"],
)
default_params["cpus_per_task"] = resources["cpus_per_task"]
default_params["mem_gb"] = resources["mem_gb"]
requirements.update(
{
key: value
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies = [
"requests~=2.32",
"httpx~=0.28",
"openai~=1.90",
"clusterscope",
]
# zip_safe = false
classifiers=[
Expand Down