Skip to content
Open
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions clu/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -784,20 +784,21 @@ class Average(Metric):

@classmethod
def empty(cls) -> Average:
return cls(total=jnp.array(0, jnp.float32), count=jnp.array(0, jnp.int32))
return cls(total=jnp.array(0, jnp.float32), count=jnp.array(0, jnp.float32))

@classmethod
def from_model_output(
cls, values: jnp.ndarray, mask: jnp.ndarray | None = None, **_
) -> Average:
values, mask = _broadcast_masks(values, mask)
return cls(
total=jnp.where(mask, values, jnp.zeros_like(values)).sum(),
total=jnp.where(mask, values, jnp.zeros_like(values)).sum().astype(
jnp.float32),
count=jnp.where(
mask,
jnp.ones_like(values, dtype=jnp.int32),
jnp.zeros_like(values, dtype=jnp.int32),
).sum(),
).sum().astype(jnp.float32),
)

def merge(self, other: Average) -> Average:
Expand Down