From 634ef86a2c0a753c7999373b27d5d1607a2aad98 Mon Sep 17 00:00:00 2001
From: Alexander Engelsberger <engelsbe@hs-mittweida.de>
Date: Tue, 20 Jun 2023 17:42:36 +0200
Subject: [PATCH] fix: example test fixed

---
 examples/siamese_glvq_iris.py     |   3 +--
 examples/siamese_gtlvq_iris.py    |   3 +--
 examples/warm_starting.py         |   4 +++-
 glvq_iris.ckpt                    | Bin 0 -> 5331 bytes
 iris.pth                          | Bin 0 -> 4927 bytes
 prototorch/models/glvq.py         |  20 --------------------
 prototorch/models/unsupervised.py |   2 +-
 7 files changed, 6 insertions(+), 26 deletions(-)
 create mode 100644 glvq_iris.ckpt
 create mode 100644 iris.pth

diff --git a/examples/siamese_glvq_iris.py b/examples/siamese_glvq_iris.py
index b00e308..ff63da9 100644
--- a/examples/siamese_glvq_iris.py
+++ b/examples/siamese_glvq_iris.py
@@ -51,8 +51,7 @@ if __name__ == "__main__":
     # Hyperparameters
     hparams = dict(
         distribution=[1, 2, 3],
-        proto_lr=0.01,
-        bb_lr=0.01,
+        lr=0.01,
     )
 
     # Initialize the backbone
diff --git a/examples/siamese_gtlvq_iris.py b/examples/siamese_gtlvq_iris.py
index 4f036d1..35405e1 100644
--- a/examples/siamese_gtlvq_iris.py
+++ b/examples/siamese_gtlvq_iris.py
@@ -51,8 +51,7 @@ if __name__ == "__main__":
     # Hyperparameters
     hparams = dict(
         distribution=[1, 2, 3],
-        proto_lr=0.01,
-        bb_lr=0.01,
+        lr=0.01,
         input_dim=2,
         latent_dim=1,
     )
diff --git a/examples/warm_starting.py b/examples/warm_starting.py
index a9e17dc..22acf51 100644
--- a/examples/warm_starting.py
+++ b/examples/warm_starting.py
@@ -55,7 +55,9 @@ if __name__ == "__main__":
 
     # Setup trainer for GNG
     trainer = pl.Trainer(
-        max_epochs=1000,
+        accelerator="cpu",
+        max_epochs=50 if args.fast_dev_run else
+        1000,  # 10 epochs fast dev run reproducible DIV error.
         callbacks=[
             es,
         ],
diff --git a/glvq_iris.ckpt b/glvq_iris.ckpt
new file mode 100644
index 0000000000000000000000000000000000000000..45793132ee27222167aa307aac09d5a032853016
GIT binary patch
literal 5331
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

literal 0
HcmV?d00001

diff --git a/iris.pth b/iris.pth
new file mode 100644
index 0000000000000000000000000000000000000000..7e485c0d5d8cca1092c35f3ddc1f6b4573e25669
GIT binary patch
literal 4927
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

literal 0
HcmV?d00001

diff --git a/prototorch/models/glvq.py b/prototorch/models/glvq.py
index 2ca9834..8f77fdd 100644
--- a/prototorch/models/glvq.py
+++ b/prototorch/models/glvq.py
@@ -123,26 +123,6 @@ class SiameseGLVQ(GLVQ):
         self.backbone = backbone
         self.both_path_gradients = both_path_gradients
 
-    def configure_optimizers(self):
-        proto_opt = self.optimizer(self.proto_layer.parameters(),
-                                   lr=self.hparams["proto_lr"])
-        # Only add a backbone optimizer if backbone has trainable parameters
-        bb_params = list(self.backbone.parameters())
-        if (bb_params):
-            bb_opt = self.optimizer(bb_params, lr=self.hparams["bb_lr"])
-            optimizers = [proto_opt, bb_opt]
-        else:
-            optimizers = [proto_opt]
-        if self.lr_scheduler is not None:
-            schedulers = []
-            for optimizer in optimizers:
-                scheduler = self.lr_scheduler(optimizer,
-                                              **self.lr_scheduler_kwargs)
-                schedulers.append(scheduler)
-            return optimizers, schedulers
-        else:
-            return optimizers
-
     def compute_distances(self, x):
         protos, _ = self.proto_layer()
         x, protos = (arr.view(arr.size(0), -1) for arr in (x, protos))
diff --git a/prototorch/models/unsupervised.py b/prototorch/models/unsupervised.py
index 8833de2..80d7d85 100644
--- a/prototorch/models/unsupervised.py
+++ b/prototorch/models/unsupervised.py
@@ -63,7 +63,7 @@ class KohonenSOM(NonGradientMixin, UnsupervisedPrototypeModel):
             strict=False,
         )
 
-    def training_epoch_end(self, training_step_outputs):
+    def on_training_epoch_end(self, training_step_outputs):
         self._sigma = self.hparams.sigma * np.exp(
             -self.current_epoch / self.trainer.max_epochs)