Commit d67a220e authored by Hines, Jesse's avatar Hines, Jesse
Browse files

Renaming

parent 3b43f122
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import pandas as pd
from tqdm import tqdm

from ..job import job_dict, Job
from ..utils import WorkloadResult
from ..utils import WorkloadData


def load_data(jobs_path, **kwargs):
@@ -200,7 +200,7 @@ def load_data_from_df(jobs_df: pd.DataFrame, **kwargs):
            count_jobs_notOK += 1

    print("jobs not added: ", count_jobs_notOK)
    return WorkloadResult(
    return WorkloadData(
        jobs=jobs,
        telemetry_start=telemetry_start_time, telemetry_end=telemetry_end_time,
        start_date=telemetry_start_timestamp.tz_localize("UTC"),
+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import pandas as pd
from pathlib import Path
from datetime import datetime, timezone
from raps.telemetry import Job, job_dict
from raps.utils import WorkloadResult
from raps.utils import WorkloadData


def throughput_traces(total_tx, total_rx, intervals):
@@ -330,7 +330,7 @@ def load_data(local_dataset_path, **kwargs):
    telemetry_start = 0
    telemetry_end = max((j.end_time for j in jobs), default=0)

    return WorkloadResult(
    return WorkloadData(
        jobs=jobs,
        telemetry_start=telemetry_start, telemetry_end=telemetry_end,
        start_date=datetime.fromtimestamp(t0, timezone.utc),
+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import pandas as pd
from tqdm import tqdm

from ..job import job_dict, Job
from ..utils import power_to_utilization, encrypt, WorkloadResult
from ..utils import power_to_utilization, encrypt, WorkloadData


def aging_boost(nnodes):
@@ -317,7 +317,7 @@ def load_data_from_df(jobs_df: pd.DataFrame, jobprofile_df: pd.DataFrame, **kwar

            job = Job(job_info)
            jobs.append(job)
    return WorkloadResult(
    return WorkloadData(
        jobs=jobs,
        telemetry_start=telemetry_start,
        telemetry_end=telemetry_end,
@@ -534,7 +534,7 @@ def load_live_data(**kwargs):
        job = Job(job_info)
        jobs.append(job)

    return WorkloadResult(
    return WorkloadData(
        jobs=jobs,
        telemetry_start=telemetry_start,
        telemetry_end=telemetry_end,
+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
import pandas as pd
from tqdm import tqdm
from ..job import job_dict, Job
from ..utils import WorkloadResult
from ..utils import WorkloadData


def load_data(path, **kwargs):
@@ -161,7 +161,7 @@ def load_data_from_df(df, **kwargs):
        job = Job(job_info)
        job_list.append(job)

    return WorkloadResult(
    return WorkloadData(
        jobs=job_list,
        telemetry_start=telemetry_start, telemetry_end=telemetry_end,
        start_date=telemetry_start_timestamp,
+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import numpy as np
import pandas as pd

from raps.job import job_dict, Job
from raps.utils import WorkloadResult
from raps.utils import WorkloadData

"""
Official instructions are here:
@@ -334,7 +334,7 @@ def load_data(data_path: Union[str, List[str]], **kwargs: Any):
    # Compute simulation span: start at t=0, end at the latest job finish
    telemetry_start = 0
    telemetry_end = int(max(usage_map_end.values()) - t0)
    return WorkloadResult(
    return WorkloadData(
        jobs=jobs,
        telemetry_start=telemetry_start, telemetry_end=telemetry_end,
        # gcloud dataset timestamps are already relative, and it doesn't list a start exact date.
Loading