Skip to content

Build evaluator and zero metrics only once #428

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

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Build evaluator and zero metrics only once #428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 8 additions & 25 deletions lib/axon/loop.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,18 +1048,13 @@ defmodule Axon.Loop do
opts = Keyword.validate!(opts, event: :epoch_completed, filter: :always)
event = opts[:event] || :epoch_completed
filter = opts[:filter] || :always
evaluator = evaluator(model)

validation_loop = fn %State{metrics: metrics, step_state: step_state} = state ->
%{model_state: model_state} = step_state

metrics =
model
|> evaluator()
|> then(
&Enum.reduce(metric_fns, &1, fn {k, {_, v}}, loop ->
metric(loop, v, k)
end)
)
Enum.reduce(metric_fns, evaluator, fn {k, {_, v}}, loop -> metric(loop, v, k) end)
|> log(fn _ -> "\n" end, event: :completed)
|> run(validation_data, model_state)
|> Access.get(0)
Expand Down Expand Up @@ -1640,18 +1635,14 @@ defmodule Axon.Loop do
Logger.debug("Axon.Loop finished initializing loop state in #{us_to_ms(time)}ms")
end

# TODO: Can we infer here?
zero_metrics = Map.new(metric_fns, fn {k, _} -> {k, Nx.tensor(0, type: :f32)} end)

final_metrics_map =
for i <- epoch_start..epoch_end do
{i, Map.new(metric_fns, fn {k, _} -> {k, Nx.tensor(0)} end)}
end
|> Map.new()
epoch_start..epoch_end
|> Map.new(&{&1, zero_metrics})
|> Map.merge(loop_state.metrics)

# TODO: Can we infer here?
zero_metrics =
metric_fns
|> Map.new(fn {k, _} -> {k, Nx.tensor(0, type: :f32)} end)

loop_state = %{loop_state | metrics: zero_metrics}

{status, final_metrics, state} =
Expand Down Expand Up @@ -1707,16 +1698,8 @@ defmodule Axon.Loop do
{:halt, {final_metrics_map, state}}

{:continue, state} ->
zero_metrics =
loop_state.metrics
|> Map.take(Map.keys(metric_fns))
|> Map.new(fn {k, v} -> {k, zeros_like(v)} end)

final_metrics_map =
Map.replace!(final_metrics_map, epoch, state.metrics)

{:cont,
{batch_fn, final_metrics_map,
{batch_fn, %{final_metrics_map | epoch => state.metrics},
%State{
state
| epoch: epoch + 1,
Expand Down