Merged PR 487: #2778 - fixed the mis-merge that was trying to call the old latex function

## Summary
- Fixed the mis-merge that was trying to call the old latex function instead of the new md function
- Removed the old threshold leftover stuff in the report too

## Test process
- Tested the benchmark report locally and it runs end-to-end

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#2778 - fixed the mis-merge that was trying to call the old latex function instead of the new md function. removed the old threshold leftover stuff in the report too

Related work items: #2778
This commit is contained in:
Christopher McCarthy
2024-07-30 09:42:10 +00:00
3 changed files with 4 additions and 12 deletions

View File

@@ -5,7 +5,7 @@ from datetime import datetime
from pathlib import Path from pathlib import Path
from typing import Any, Dict, Final, Tuple from typing import Any, Dict, Final, Tuple
from report import build_benchmark_latex_report from report import build_benchmark_md_report
from stable_baselines3 import PPO from stable_baselines3 import PPO
import primaite import primaite
@@ -188,7 +188,7 @@ def run(
with open(_SESSION_METADATA_ROOT / f"{i}.json", "r") as file: with open(_SESSION_METADATA_ROOT / f"{i}.json", "r") as file:
session_metadata_dict[i] = json.load(file) session_metadata_dict[i] = json.load(file)
# generate report # generate report
build_benchmark_latex_report( build_benchmark_md_report(
benchmark_start_time=benchmark_start_time, benchmark_start_time=benchmark_start_time,
session_metadata=session_metadata_dict, session_metadata=session_metadata_dict,
config_path=data_manipulation_config_path(), config_path=data_manipulation_config_path(),

View File

@@ -234,10 +234,7 @@ def _plot_av_s_per_100_steps_10_nodes(
""" """
major_v = primaite.__version__.split(".")[0] major_v = primaite.__version__.split(".")[0]
title = f"Performance of Minor and Bugfix Releases for Major Version {major_v}" title = f"Performance of Minor and Bugfix Releases for Major Version {major_v}"
subtitle = ( subtitle = "Average Training Time per 100 Steps on 10 Nodes "
f"Average Training Time per 100 Steps on 10 Nodes "
f"(target: <= {PLOT_CONFIG['av_s_per_100_steps_10_nodes_benchmark_threshold']} seconds)"
)
title = f"{title} <br><sub>{subtitle}</sub>" title = f"{title} <br><sub>{subtitle}</sub>"
layout = go.Layout( layout = go.Layout(
@@ -250,10 +247,6 @@ def _plot_av_s_per_100_steps_10_nodes(
versions = sorted(list(version_times_dict.keys())) versions = sorted(list(version_times_dict.keys()))
times = [version_times_dict[version] for version in versions] times = [version_times_dict[version] for version in versions]
av_s_per_100_steps_10_nodes_benchmark_threshold = PLOT_CONFIG["av_s_per_100_steps_10_nodes_benchmark_threshold"]
# Calculate the appropriate maximum y-axis value
max_y_axis_value = max(max(times), av_s_per_100_steps_10_nodes_benchmark_threshold) + 1
fig.add_trace( fig.add_trace(
go.Bar( go.Bar(
@@ -267,7 +260,6 @@ def _plot_av_s_per_100_steps_10_nodes(
fig.update_layout( fig.update_layout(
xaxis_title="PrimAITE Version", xaxis_title="PrimAITE Version",
yaxis_title="Avg Time per 100 Steps on 10 Nodes (seconds)", yaxis_title="Avg Time per 100 Steps on 10 Nodes (seconds)",
yaxis=dict(range=[0, max_y_axis_value]),
title=title, title=title,
) )

View File

@@ -52,7 +52,7 @@ license-files = ["LICENSE"]
[project.optional-dependencies] [project.optional-dependencies]
rl = [ rl = [
"ray[rllib] >= 2.20.0, < 3", "ray[rllib] >= 2.20.0, <2.33",
"tensorflow==2.12.0", "tensorflow==2.12.0",
"stable-baselines3[extra]==2.1.0", "stable-baselines3[extra]==2.1.0",
"sb3-contrib==2.1.0", "sb3-contrib==2.1.0",