Skip to content

Commit 5c28d51

Browse files
committed
upd
1 parent 90a0057 commit 5c28d51

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

oml/functional/metrics.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def take_unreduced_metrics_by_mask(metrics: TMetricsDict, mask: BoolTensor) -> T
108108
output: TMetricsDict = {}
109109

110110
for k, v in metrics.items():
111-
print("uuu", v)
112111
if isinstance(v, (Tensor, np.ndarray)):
113112
output[k] = v[mask]
114113
elif isinstance(v, (float, int)):
@@ -449,7 +448,8 @@ def calc_fnmr_at_fmr(pos_dist: FloatTensor, neg_dist: FloatTensor, fmr_vals: Tup
449448
Example:
450449
>>> pos_dist = torch.tensor([0, 0, 1, 1, 2, 2, 5, 5, 9, 9])
451450
>>> neg_dist = torch.tensor([3, 3, 4, 4, 6, 6, 7, 7, 8, 8])
452-
>>> calc_fnmr_at_fmr(pos_dist, neg_dist, fmr_vals=(0.1, 0.5))
451+
>>> metrics = calc_fnmr_at_fmr(pos_dist, neg_dist, fmr_vals=(0.1, 0.5))
452+
>>> [round(m, 4) for metric in metrics]
453453
[0.4000, 0.2000]
454454
455455
"""
@@ -515,7 +515,8 @@ def calc_pcf(embeddings: FloatTensor, pcf_variance: Tuple[float, ...]) -> List[f
515515
because the number of principal axes is superior to the desired explained variance threshold).
516516
517517
>>> embeddings = torch.eye(4, 10, dtype=torch.float)
518-
>>> calc_pcf(embeddings, pcf_variance=(0.5, 1))
518+
>>> metrics = calc_pcf(embeddings, pcf_variance=(0.5, 1))
519+
>>> [round(m, 4) for m in metrics]
519520
[0.2000, 0.5000]
520521
521522
"""

oml/metrics/embeddings.py

-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ def compute_metrics(self) -> TMetricsDict_ByLabels: # type: ignore
236236
for category in np.unique(query_categories):
237237
mask = query_categories == category
238238

239-
print(metrics[self.overall_categories_key], mask, "zzz")
240239
metrics[category] = take_unreduced_metrics_by_mask(metrics[self.overall_categories_key], mask)
241240

242241
metrics[category].update(

oml/registry/transforms.py

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def save_transforms_as_files(cfg: TCfg) -> List[Tuple[str, str]]:
108108
keys_files.append((key, transforms_file))
109109
except Exception:
110110
print(f"We are not able to interpret {key} as albumentations transforms and log them as a file.")
111-
print(keys_files, "zzzz")
112111
return keys_files
113112

114113

tests/test_oml/test_registry/test_registry.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,10 @@ def test_saving_transforms_as_files() -> None:
140140
141141
"""
142142
cfg = yaml.safe_load(cfg)
143-
save_transforms_as_files(cfg)
143+
names_files = save_transforms_as_files(cfg)
144144

145-
assert Path("transforms_train.yaml").exists() or Path(".hydra/transforms_train.yaml").exists()
146-
assert (not Path("transforms_val.yaml").exists()) and (not Path("transforms_val.yaml").exists())
145+
assert len(names_files) == 1, "Check that we only saved train transforms as expected"
147146

148-
if Path("transforms_train.yaml").exists():
149-
Path("transforms_train.yaml").unlink()
150-
else:
151-
Path(".hydra/transforms_train.yaml").unlink()
147+
file = Path(names_files[0][1])
148+
assert file.exists()
149+
Path(file).unlink()

0 commit comments

Comments
 (0)