Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Studio dvcyaml #709

Merged
merged 4 commits into from
Sep 14, 2023
Merged

Studio dvcyaml #709

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
093ce86
drop dvc.yaml prefix from studio plots
Sep 12, 2023
86bd3d5
refactor
Sep 12, 2023
085621c
drop .dvc files
Sep 12, 2023
60a0d48
dvc version bump
Sep 14, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,6 @@ dmypy.json
# Cython debug symbols
cython_debug/

.dvc/
.dvcignore
Comment on lines +140 to +141
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated, but I keep getting these generated when running tests

src/dvclive/_dvclive_version.py
19 changes: 5 additions & 14 deletions src/dvclive/studio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,9 @@ def _cast_to_numbers(datapoints):
return datapoints


def _adapt_plot_name(live, name):
def _adapt_path(live, name):
if live._dvc_repo is not None:
name = rel_path(name, live._dvc_repo.root_dir)
if os.path.isfile(live.dvc_file):
dvc_file = live.dvc_file
if live._dvc_repo is not None:
dvc_file = rel_path(live.dvc_file, live._dvc_repo.root_dir)
name = f"{dvc_file}::{name}"
return name


Expand All @@ -56,9 +51,7 @@ def _adapt_image(image_path):

def _adapt_images(live):
return {
_adapt_plot_name(live, image.output_path): {
"image": _adapt_image(image.output_path)
}
_adapt_path(live, image.output_path): {"image": _adapt_image(image.output_path)}
for image in live._images.values()
if image.step > live._latest_studio_step
}
Expand All @@ -67,21 +60,19 @@ def _adapt_images(live):
def get_studio_updates(live):
if os.path.isfile(live.params_file):
params_file = live.params_file
if live._dvc_repo is not None:
params_file = rel_path(params_file, live._dvc_repo.root_dir)
params_file = _adapt_path(live, params_file)
params = {params_file: load_yaml(live.params_file)}
else:
params = {}

plots, metrics = parse_metrics(live)

metrics_file = live.metrics_file
if live._dvc_repo is not None:
metrics_file = rel_path(metrics_file, live._dvc_repo.root_dir)
metrics_file = _adapt_path(live, metrics_file)
metrics = {metrics_file: {"data": metrics}}

plots = {
_adapt_plot_name(live, name): _adapt_plot_datapoints(live, plot)
_adapt_path(live, name): _adapt_plot_datapoints(live, plot)
for name, plot in plots.items()
}
plots = {k: {"data": v} for k, v in plots.items()}
Expand Down
24 changes: 7 additions & 17 deletions tests/test_post_to_studio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ def test_post_to_studio(tmp_dir, mocked_dvc_repo, mocked_studio_post):
live = Live()
live.log_param("fooparam", 1)

dvc_path = Path(live.dvc_file).relative_to(mocked_dvc_repo.root_dir).as_posix()
foo_path = (Path(live.plots_dir) / Metric.subfolder / "foo.tsv").as_posix()

mocked_post, _ = mocked_studio_post
Expand All @@ -54,7 +53,7 @@ def test_post_to_studio(tmp_dir, mocked_dvc_repo, mocked_studio_post):
"data",
exp_name=live._exp_name,
step=0,
plots={f"{dvc_path}::{foo_path}": {"data": [{"step": 0, "foo": 1.0}]}},
plots={f"{foo_path}": {"data": [{"step": 0, "foo": 1.0}]}},
),
)

Expand All @@ -67,7 +66,7 @@ def test_post_to_studio(tmp_dir, mocked_dvc_repo, mocked_studio_post):
"data",
exp_name=live._exp_name,
step=1,
plots={f"{dvc_path}::{foo_path}": {"data": [{"step": 1, "foo": 2.0}]}},
plots={f"{foo_path}": {"data": [{"step": 1, "foo": 2.0}]}},
),
)

Expand All @@ -89,7 +88,6 @@ def test_post_to_studio_failed_data_request(

live = Live()

dvc_path = Path(live.dvc_file).relative_to(mocked_dvc_repo.root_dir).as_posix()
foo_path = (Path(live.plots_dir) / Metric.subfolder / "foo.tsv").as_posix()

error_response = mocker.MagicMock()
Expand All @@ -108,7 +106,7 @@ def test_post_to_studio_failed_data_request(
exp_name=live._exp_name,
step=1,
plots={
f"{dvc_path}::{foo_path}": {
f"{foo_path}": {
"data": [{"step": 0, "foo": 1.0}, {"step": 1, "foo": 2.0}]
}
},
Expand Down Expand Up @@ -207,7 +205,6 @@ def test_post_to_studio_shorten_names(tmp_dir, mocked_dvc_repo, mocked_studio_po
live.log_metric("eval/loss", 1)
live.next_step()

dvc_path = Path(live.dvc_file).relative_to(mocked_dvc_repo.root_dir).as_posix()
plots_path = Path(live.plots_dir)
loss_path = (plots_path / Metric.subfolder / "eval/loss.tsv").as_posix()

Expand All @@ -217,7 +214,7 @@ def test_post_to_studio_shorten_names(tmp_dir, mocked_dvc_repo, mocked_studio_po
"data",
exp_name=live._exp_name,
step=0,
plots={f"{dvc_path}::{loss_path}": {"data": [{"step": 0, "loss": 1.0}]}},
plots={f"{loss_path}": {"data": [{"step": 0, "loss": 1.0}]}},
),
)

Expand Down Expand Up @@ -252,7 +249,6 @@ def test_post_to_studio_inside_subdir(
live.log_metric("foo", 1)
live.next_step()

dvc_path = Path(live.dvc_file).relative_to(mocked_dvc_repo.root_dir).as_posix()
foo_path = (Path(live.plots_dir) / Metric.subfolder / "foo.tsv").as_posix()

mocked_post.assert_called_with(
Expand All @@ -262,9 +258,7 @@ def test_post_to_studio_inside_subdir(
baseline_sha=live._baseline_rev,
exp_name=live._exp_name,
step=0,
plots={
f"{dvc_path}::subdir/{foo_path}": {"data": [{"step": 0, "foo": 1.0}]}
},
plots={f"subdir/{foo_path}": {"data": [{"step": 0, "foo": 1.0}]}},
),
)

Expand All @@ -285,7 +279,6 @@ def test_post_to_studio_inside_subdir_dvc_exp(
live.log_metric("foo", 1)
live.next_step()

dvc_path = Path(live.dvc_file).relative_to(mocked_dvc_repo.root_dir).as_posix()
foo_path = (Path(live.plots_dir) / Metric.subfolder / "foo.tsv").as_posix()

mocked_post.assert_called_with(
Expand All @@ -295,9 +288,7 @@ def test_post_to_studio_inside_subdir_dvc_exp(
baseline_sha=live._baseline_rev,
exp_name=live._exp_name,
step=0,
plots={
f"{dvc_path}::subdir/{foo_path}": {"data": [{"step": 0, "foo": 1.0}]}
},
plots={f"subdir/{foo_path}": {"data": [{"step": 0, "foo": 1.0}]}},
),
)

Expand Down Expand Up @@ -342,7 +333,6 @@ def test_post_to_studio_images(tmp_dir, mocked_dvc_repo, mocked_studio_post):
live.log_image("foo.png", ImagePIL.new("RGB", (10, 10), (0, 0, 0)))
live.next_step()

dvc_path = Path(live.dvc_file).relative_to(mocked_dvc_repo.root_dir).as_posix()
foo_path = (Path(live.plots_dir) / Image.subfolder / "foo.png").as_posix()

mocked_post.assert_called_with(
Expand All @@ -352,7 +342,7 @@ def test_post_to_studio_images(tmp_dir, mocked_dvc_repo, mocked_studio_post):
baseline_sha=live._baseline_rev,
exp_name=live._exp_name,
step=0,
plots={f"{dvc_path}::{foo_path}": {"image": _adapt_image(foo_path)}},
plots={f"{foo_path}": {"image": _adapt_image(foo_path)}},
),
)

Expand Down