fixes default_constraining_bijector_fn of a1

MArpogaus · Feb 6, 2024 · 3bb49cf · 3bb49cf · github-actions · Feb 6, 2024
1 parent 31a7059
commit 3bb49cf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/cml/bimodal.py b/cml/bimodal.py
@@ -5,7 +5,7 @@
 # author  : Marcel Arpogaus <marcel dot arpogaus at gmail dot com>
 #
 # created : 2021-03-22 16:42:31 (Marcel Arpogaus)
-# changed : 2024-02-06 13:55:44 (Marcel Arpogaus)
+# changed : 2024-02-06 15:02:27 (Marcel Arpogaus)
 # DESCRIPTION ############################################################
 # ...
 # LICENSE ################################################################
@@ -155,7 +155,7 @@ def fit_model(
         train_y,
         validation_data=(val_x, val_y),
         epochs=epochs,
-        # shuffle=True,
+        shuffle=True,
         batch_size=batch_size,
         callbacks=callbacks,
         **kwds,

diff --git a/cml/old_faithful.py b/cml/old_faithful.py
@@ -5,7 +5,7 @@
 # author  : Marcel Arpogaus <marcel dot arpogaus at gmail dot com>
 #
 # created : 2021-03-22 11:14:00 (Marcel Arpogaus)
-# changed : 2024-02-06 14:42:02 (Marcel Arpogaus)
+# changed : 2024-02-06 14:58:19 (Marcel Arpogaus)
 # DESCRIPTION ############################################################
 # ...
 # LICENSE ################################################################
@@ -122,10 +122,7 @@ def negloglik(y_true, pv):
 
 flow_model.compile(optimizer=tf.optimizers.Adam(learning_rate=0.01), loss=negloglik)
 
-hist = flow_model.fit(
-    dataset,
-    epochs=1000,
-)
+hist = flow_model.fit(dataset, epochs=1000, shuffle=True)
 
 
 # %% Result

diff --git a/cml/params.yaml b/cml/params.yaml
@@ -2,7 +2,6 @@ bimodal:
   fit_kwds:
     batch_size: 32
     epochs: 1000
-    # steps_per_epoch: 2
   model_kwds:
     output_shape: 20
     thetas_constrain_fn: !!python/object/apply:bernstein_flow.activations.get_thetas_constrain_fn

diff --git a/metrics/bimodal/bm_metrics.yaml b/metrics/bimodal/bm_metrics.yaml
@@ -1,2 +1,2 @@
-loss: -0.8797889947891235
-val_loss: -0.9052213430404663
+loss: -0.8145940899848938
+val_loss: -0.8566501140594482
diff --git a/metrics/old_faithful/of_metrics.txt b/metrics/old_faithful/of_metrics.txt
@@ -1 +1 @@
-Min of loss: -0.7447453737258911
+Min of loss: -0.7492111325263977
diff --git a/src/bernstein_flow/distributions/bernstein_flow.py b/src/bernstein_flow/distributions/bernstein_flow.py
@@ -233,7 +233,11 @@ def __init__(
     @classmethod
     def _parameter_properties(cls, dtype=None, num_classes=None):
         return dict(
-            a1=tfb.Scale.parameter_properties(dtype)["scale"],
+            a1=tfp.util.ParameterProperties(
+                default_constraining_bijector_fn=lambda: tfb.Softplus(
+                    low=dtype_util.eps(dtype)
+                )
+            ),
             b1=tfb.Shift.parameter_properties(dtype)["shift"],
             thetas=BernsteinBijector.parameter_properties(dtype)["thetas"],
             a2=tfp.util.ParameterProperties(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Min of loss: -0.7447453737258911
		Min of loss: -0.7492111325263977