resolve conflict

nnaakkaaii · Jul 4, 2024 · 5a00780 · 5a00780
2 parents 76e0194 + a371476
commit 5a00780
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 277 deletions.
diff --git a/bin/mmnist/autoencoder2d/best_encoder.pth b/bin/mmnist/autoencoder2d/best_encoder.pth
diff --git a/bin/mmnist/autoencoder2d/contrastive05/best_decoder.pth b/bin/mmnist/autoencoder2d/contrastive05/best_decoder.pth
diff --git a/bin/mmnist/autoencoder2d/contrastive05/best_encoder.pth b/bin/mmnist/autoencoder2d/contrastive05/best_encoder.pth
diff --git a/bin/mmnist/autoencoder2d/contrastive05/best_model.pth b/bin/mmnist/autoencoder2d/contrastive05/best_model.pth
diff --git a/hrdae/__init__.py b/hrdae/__init__.py
@@ -160,7 +160,7 @@
 )
 cs.store(
     group="config/experiment/model/loss",
-    name="perceptual",
+    name="perceptual2d",
     node=Perceptual2dLossOption,
 )
 cs.store(