Davout 0.1.1.dev157__tar.gz → 0.1.1.dev158__tar.gz

{davout-0.1.1.dev157/source/Davout.egg-info → davout-0.1.1.dev158}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev157
+Version: 0.1.1.dev158
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>

{davout-0.1.1.dev157 → davout-0.1.1.dev158}/pyproject.toml

@@ -63,7 +63,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Davout"
-version = "0.1.1.dev157"
+version = "0.1.1.dev158"
 description = "Scientific computing utilities combining FEM, ANN and tooling"
 readme = "README.md"
 authors = [

{davout-0.1.1.dev157 → davout-0.1.1.dev158}/source/Davout/DeepMech/aa_tests/tests_tool_box/test_SVD_based_NNs.py

@@ -526,7 +526,8 @@ class TestSVDArchitecture:
             modulating_function_performance, "Householder epsilon": 1.0, 
             "activations accessory layer list": 
             accessory_activation_list_performance, "householder vector"+
-            " builder method": householder_vector_builder_method}  
+            " builder method": householder_vector_builder_method,
+            "hardware device": "CPU"}  
 
             # Assembles the model
 

{davout-0.1.1.dev157 → davout-0.1.1.dev158}/source/Davout/DeepMech/aa_tests/tests_tool_box/test_quotient_space_NNs.py

@@ -11,9 +11,11 @@ import os
 
 import tensorflow as tf
 
-from ...tool_box import ANN_tools
+from .....Davout.DeepMech.tool_box import ANN_tools
 
-from ...tool_box import training_tools
+from .....Davout.DeepMech.tool_box import training_tools
+
+from .....Davout.PythonicUtilities.path_tools import get_parent_path_of_file
 
 # Defines a function to test the ANN tools methods
 
@@ -104,7 +106,60 @@ class TestANNTools(unittest.TestCase):
 
         self.save_model_file = "saved_model.keras"
 
-    # Defines a function to test the gated architecture
+        self.parameters_dtype = "float64"
+    
+    # Defines a function to test saving and reloading the model
+    
+    def test_saving_and_loading(self):
+
+        print("\n#####################################################"+
+        "###################\n#                       Tests saving and"+
+        " loading                       #\n###########################"+
+        "#############################################\n")
+        
+        # Sets the path to save the model
+
+        model_path = os.path.join(get_parent_path_of_file(), "gated_mo"+
+        "del.keras")
+
+        print("\nSaves the model at: "+str(model_path)+"\n")
+
+        # Saves the model
+
+        # Tests now with custom layers
+        
+        ANN_class = ANN_tools.MultiLayerModel(
+        self.input_dimension_gradient_tests, 
+        self.activation_list_gradient_tests, enforce_customLayers=True, 
+        verbose=True, parameters_dtype=self.parameters_dtype, 
+        custom_architecture={"name": "GatedQuotientSpace", 
+        "quotient space dimension": self.quotient_space_dimension})
+
+        custom_model = ANN_class()
+
+        custom_model.save(model_path)
+
+        # Loads it back
+
+        loaded_model = tf.keras.models.load_model(model_path)
+
+        # Gets the training data as a tensorflow array
+
+        self.training_input_constant = tf.constant(self.training_data, 
+        dtype=tf.as_dtype(self.parameters_dtype))
+
+        # Tests the loaded model
+
+        output_original = custom_model(self.training_input_constant)
+
+        output_loaded = loaded_model(self.training_input_constant)
+
+        print("Output from saved model:\n"+str(output_original))
+
+        print("\nOutput from loaded model:\n"+str(output_loaded)+"\n\n"+
+        "The maximum absolute difference between components of the ori"+
+        "ginal and loaded models is: "+str(tf.reduce_max(tf.abs(
+        output_original-output_loaded)).numpy())+"\n")
 
     def test_gated_nn(self):
 

{davout-0.1.1.dev157 → davout-0.1.1.dev158}/source/Davout/DeepMech/tool_box/ANN_tools.py

@@ -4,6 +4,8 @@ import tensorflow as tf
 
 import numpy as np
 
+import inspect
+
 from ...DeepMech import custom_architectures
 
 from ..tool_box import differentiation_tools as diff_tools
@@ -679,8 +681,23 @@ class MixedActivationLayer(tf.keras.layers.Layer):
 
         code_info_dictionary = config.pop("code_given_info_class")
 
+        # Gets all the necessary arguments of CodeGivenLayerInfo
+
+        arguments_of_layer_info = inspect.signature(CodeGivenLayerInfo
+        ).parameters.keys()
+
+        # Completes the dictionary of code-given information to allow
+        # for the inclusion of keys that were not incorporated in older
+        # models. Notice that, for missing keys, the default value will
+        # be None
+
+        complete_dictionary = {argument_name: code_info_dictionary.get(
+        argument_name, None) for argument_name in arguments_of_layer_info}
+
+        # Instantiates the class of code-given information
+
         config["code_given_info_class"] = CodeGivenLayerInfo(
-        **code_info_dictionary)
+        **complete_dictionary)
 
         return cls(**config)
 

{davout-0.1.1.dev157 → davout-0.1.1.dev158/source/Davout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Davout
-Version: 0.1.1.dev157
+Version: 0.1.1.dev158
 Summary: Scientific computing utilities combining FEM, ANN and tooling
 Author: Matheus Janczkowski
 Author-email: Matheus Janczkowski <matheusj2009@hotmail.com>