Skip to content

Commit 9de2f2b

Browse files
committed
Simplify
1 parent d780974 commit 9de2f2b

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/pydvl/valuation/scorers/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def compose_score(
3737
The composite [SupervisedScorer][pydvl.valuation.scorers.SupervisedScorer].
3838
"""
3939

40-
class CompositeSupervisedScorer(SupervisedScorer[SupervisedModelT, ArrayT]):
40+
class CompositeSupervisedScorer(SupervisedScorer):
4141
def __call__(self, model: SupervisedModelT) -> float:
4242
raw = super().__call__(model)
4343
return transformation(raw)

src/pydvl/valuation/utility/classwise.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66

77
from __future__ import annotations
88

9-
from typing import cast
10-
119
import numpy as np
1210

13-
from pydvl.utils.array import Array
1411
from pydvl.utils.caching import CacheBackend, CachedFuncConfig
1512
from pydvl.valuation.scorers.classwise import ClasswiseSupervisedScorer
16-
from pydvl.valuation.types import ClasswiseSample, IndexT, SupervisedModel
13+
from pydvl.valuation.types import ClasswiseSample, SupervisedModel
1714
from pydvl.valuation.utility import ModelUtility
1815

1916
__all__ = ["ClasswiseModelUtility"]
@@ -74,9 +71,6 @@ def _utility(self, sample: ClasswiseSample) -> float:
7471
# - combine the in-class and out-of-class subsets
7572
self.scorer.label = sample.label
7673
new_sample = sample.with_subset(
77-
cast(
78-
Array[IndexT],
79-
np.union1d(sample.subset, sample.ooc_subset).astype(np.int_),
80-
)
74+
np.union1d(sample.subset, sample.ooc_subset).astype(np.int_),
8175
)
8276
return super()._utility(new_sample)

0 commit comments

Comments
 (0)