likelihood 1.2.18__py3-none-any.whl → 1.2.20__py3-none-any.whl

likelihood/models/deep/autoencoders.py

@@ -6,11 +6,13 @@ import keras_tuner
 import numpy as np
 import pandas as pd
 import tensorflow as tf
+from likelihood.tools import OneHotEncoder
 from pandas.core.frame import DataFrame
 
-from likelihood.tools import OneHotEncoder
+tf.compat.v1.logging.set_verbosity(tf.compat.v1.logging.ERROR)
 
 
+@tf.keras.utils.register_keras_serializable(package="Custom", name="AutoClassifier")
 class AutoClassifier(tf.keras.Model):
     """
     An auto-classifier model that automatically determines the best classification strategy based on the input data.
@@ -54,7 +56,7 @@ class AutoClassifier(tf.keras.Model):
         self.decoder = None
         self.classifier = None
 
-    def build(self, input_shape_parm):
+    def build(self, input_shape):
         self.encoder = tf.keras.Sequential(
             [
                 tf.keras.layers.Dense(units=self.units, activation=self.activation),
@@ -187,7 +189,7 @@ def setup_model(
     train_size: float = 0.7,
     seed=None,
     train_mode: bool = True,
-    filepath: str = "./my_dir/best_model.keras",
+    filepath: str = "./my_dir/best_model",
     **kwargs,
 ) -> AutoClassifier:
     """Setup model for training and tuning.
@@ -236,6 +238,7 @@ def setup_model(
     verbose = kwargs["verbose"] if "verbose" in kwargs else True
 
     X = data.drop(columns=target)
+    input_sample = X.sample(1)
     y = data[target]
     # Verify if there are categorical columns in the dataframe
     assert (
@@ -260,8 +263,9 @@ def setup_model(
         y_encoder = OneHotEncoder()
         y = y_encoder.encode(y.to_list())
         X = X.to_numpy()
+        input_sample.to_numpy()
         X = np.asarray(X).astype(np.float32)
-
+        input_sample = np.asarray(input_sample).astype(np.float32)
         y = np.asarray(y).astype(np.float32)
 
         input_shape_parm = X.shape[1]
@@ -284,9 +288,10 @@ def setup_model(
         tuner.search(X, y, epochs=epochs, validation_split=validation_split)
         models = tuner.get_best_models(num_models=2)
         best_model = models[0]
+        best_model(input_sample)
 
         # save model
-        best_model.save(filepath)
+        best_model.save(filepath, save_format="tf")
 
         if verbose:
             tuner.results_summary()

{likelihood-1.2.18.dist-info → likelihood-1.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: likelihood
-Version: 1.2.18
+Version: 1.2.20
 Summary: A package that performs the maximum likelihood algorithm.
 Home-page: https://github.com/jzsmoreno/likelihood/
 Author: J. A. Moreno-Guerra

{likelihood-1.2.18.dist-info → likelihood-1.2.20.dist-info}/RECORD

@@ -8,12 +8,12 @@ likelihood/models/regression.py,sha256=9cakyGlJCEO6WfpoKLh3GxdXQeQp7cUvJIkQ5odT0
 likelihood/models/simulation.py,sha256=mdgQPg_LEY5svPaF4TFv-DoQRE2oP2ig_uXnwINtewM,4039
 likelihood/models/utils.py,sha256=VtEj07lV-GRoWraQgpfjU0jTt1Ntf9MXgYwe6XYQh20,1552
 likelihood/models/deep/__init__.py,sha256=-KIPippVaMqgG8mEgYjNxYQdqOUcFhUuKhbVe8TTCfo,28
-likelihood/models/deep/autoencoders.py,sha256=lUvFQ7lbjvIPR_IKFnK5VCrSa419P5dOaTL3qSHntJk,9623
+likelihood/models/deep/autoencoders.py,sha256=s-3ZskcNtB3kg1lQD8KzJ0ff3R_OtVsePTYeShE4FxU,9940
 likelihood/tools/__init__.py,sha256=MCjsCWfBNKE2uMN0VizDN1uFzZ_md0X2WZeBdWhrCR8,50
 likelihood/tools/numeric_tools.py,sha256=cPTPgdww2ofxfyhJDomqvtXDgsSDs9iRQ7GHLt5Vl6M,8457
 likelihood/tools/tools.py,sha256=O39aPxTNsaBVSJFIkNsUESNSkfG4C7GG77wcR51a8IQ,42543
-likelihood-1.2.18.dist-info/LICENSE,sha256=XWHWt9egYEUHGPTnlcZfJKLPmysacOwdiLj_-J7Z9ew,1066
-likelihood-1.2.18.dist-info/METADATA,sha256=8nAjAwwqCDw8K9IBzKG2cgBU5DOLAA-N-RIlr02eyjU,2518
-likelihood-1.2.18.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-likelihood-1.2.18.dist-info/top_level.txt,sha256=KDiBLr870YTxqLFqObTOSrTK10uw8dFsITSNLlte3PA,11
-likelihood-1.2.18.dist-info/RECORD,,
+likelihood-1.2.20.dist-info/LICENSE,sha256=XWHWt9egYEUHGPTnlcZfJKLPmysacOwdiLj_-J7Z9ew,1066
+likelihood-1.2.20.dist-info/METADATA,sha256=0Gw81rc3h8Ovr2ESuqRexKWQroFl9MUJMu3oi9wfAZw,2518
+likelihood-1.2.20.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+likelihood-1.2.20.dist-info/top_level.txt,sha256=KDiBLr870YTxqLFqObTOSrTK10uw8dFsITSNLlte3PA,11
+likelihood-1.2.20.dist-info/RECORD,,