Updates based on code review

Author: spirali

crates/hyperqueue/src/client/output/cli.rs

@@ -13,9 +13,9 @@ use crate::server::autoalloc::{Allocation, AllocationState};
 use crate::server::job::{JobTaskCounters, JobTaskInfo, JobTaskState};
 use crate::stream::reader::outputlog::Summary;
 use crate::transfer::messages::{
-    AutoAllocListQueuesResponse, JobDetail, JobInfo, JobTaskDescription, QueueData,
-    QueueState, ServerInfo, TaskDescription, TaskKind, TaskKindProgram, WaitForJobsResponse,
-    WorkerExitInfo, WorkerInfo,
+    AutoAllocListQueuesResponse, JobDetail, JobInfo, JobTaskDescription, QueueData, QueueState,
+    ServerInfo, TaskDescription, TaskKind, TaskKindProgram, WaitForJobsResponse, WorkerExitInfo,
+    WorkerInfo,
 };
 use tako::{JobId, JobTaskCount, JobTaskId, TaskId, WorkerId};
 

docs/jobs/resources.md

@@ -367,12 +367,12 @@ They are used to adjust priority between different tasks or between multiple res
 task.
 
 The default resource weight is **1.0**. You can modify this using the --weight=<number>` option.
-Weights function as a multiplier for resource "value". For example, a task equesting 6 CPUs with a weight of 1.0
+Weights function as a multiplier for resource "value". For example, a task requesting 6 CPUs with a weight of 1.0
 carries the same weight in the scheduler as a task requesting 2 CPUs with a eight of 3.0.
 
 ### Weights vs. Priorities
 
-While both systems influence scheduling order, they function on different logic. he table below outlines the primary
+While both systems influence scheduling order, they function on different logic. The table below outlines the primary
 distinctions:
 
 | Feature         | Priorities                                                                                                      | Weights                                                                                                                   |

tests/conftest.py

@@ -9,12 +9,13 @@
 
 import pytest
 
-pytest.register_assert_rewrite("tests.utils.table")
-
-from .utils import parse_tables
 from .utils.mock import ProgramMock
 from .utils.wait import wait_until
 
+pytest.register_assert_rewrite("tests.utils.table")
+
+from .utils import parse_tables  # noqa: E402
+
 PYTEST_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT_DIR = os.path.dirname(PYTEST_DIR)
 

tests/test_jobfile.py

@@ -462,3 +462,26 @@ def test_job_file_multinode(hq_env: HqEnv, tmp_path):
     with open(default_task_output(1)) as f:
         lines = sorted(f.read().rstrip().split("\n"))
         assert lines == ["2", "worker1", "worker2"]
+
+
+def test_job_variant_weights(hq_env: HqEnv, tmp_path):
+    hq_env.start_server()
+    tmp_path.joinpath("job.toml").write_text(
+        """
+    [[task]]
+    id = 0
+    command = ["bash", "-c", "echo ${HQ_NUM_NODES}; cat ${HQ_NODE_FILE}"]
+    [[task.request]]
+    resources = {"cpus" = 2}
+    weight = 2
+    [[task.request]]
+    resources = {"cpus" = 1, "gpus" = 2}
+    weight = 0.5
+    """
+    )
+    hq_env.command(["job", "submit-file", "job.toml"])
+    table = hq_env.command(["task", "info", "1", "0"], as_table=True)
+    table.check_row_value(
+        "Resources",
+        "# Variant 1\ncpus: 2 compact\n[weight: 2]\n# Variant 2\ncpus: 1 compact\ngpus: 2 compact\n[weight: 0.5]",
+    )