Davout 0.1.1.dev169__tar.gz → 0.1.1.dev170__tar.gz

{davout-0.1.1.dev169/source/Davout.egg-info → davout-0.1.1.dev170}/PKG-INFO

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

{davout-0.1.1.dev169 → davout-0.1.1.dev170}/pyproject.toml

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

{davout-0.1.1.dev169 → davout-0.1.1.dev170}/source/Davout/DeepMech/aa_tests/mecsol_2026_quotient_space/neural_network_trainer.py

@@ -24,7 +24,7 @@ class SurrogateModel:
     def __init__(self, displacement_data_file, input_data_file, 
     saved_model_file, results_path, n_training_samples, 
     quotient_space_dimension, n_monte_carlo_realizations, n_best_models,
-    n_best_samples, mesh_file_name, screenshots_path):
+    n_best_samples, mesh_file_name, screenshots_path, optimizer):
 
         # Stores the data
 
@@ -50,6 +50,8 @@ class SurrogateModel:
 
         self.screenshots_path = screenshots_path
 
+        self.optimizer = optimizer
+
         # Reads the two files
 
         self.output_data = np.load(self.results_path+"//"+
@@ -60,7 +62,7 @@ class SurrogateModel:
         # Sets a list of layers and the activation functions
 
         self.activations_list = [{"elu": {"number of neurons": 100}}, {
-        "elu": {"number of neurons": 1000}}, {"linear": 
+        "elu": {"number of neurons": 100}}, {"linear": 
         self.n_output_neurons}]
 
     # Defines a function to train the neural network model
@@ -113,7 +115,7 @@ class SurrogateModel:
         maximum_iterations, verbose_deltaIterations=
         verbose_delta_iterations, save_model_file=self.saved_model_file, 
         match_data_float_type_to_trainables=True, parent_path=
-        self.results_path)
+        self.results_path, optimizer=self.optimizer)
 
         t_initial = time()
 
@@ -515,6 +517,8 @@ if __name__=="__main__":
 
     n_best_samples = 10
 
+    optimizer = "Adam"
+
     training_flag = True 
 
     test_flag = False
@@ -532,7 +536,7 @@ if __name__=="__main__":
     surrogate_model_class = SurrogateModel(displacement_data_file, 
     input_data_file, saved_model_file, results_path, n_training_samples, 
     quotient_space_dimension, n_monte_carlo_realizations, n_best_models,
-    n_best_samples, mesh_file_name, screenshots_path)
+    n_best_samples, mesh_file_name, screenshots_path, optimizer)
 
     # Sets training forth if it is the case
 

{davout-0.1.1.dev169 → davout-0.1.1.dev170}/source/Davout/DeepMech/tool_box/training_tools.py

@@ -389,7 +389,8 @@ class ModelCustomTraining:
                 # are consistent
 
                 verify_dictionary_as_function_argument(
-                optimizer_class.__init__, optimizer_additional_info)
+                optimizer_class.__init__, optimizer_additional_info,
+                list_of_arguments_not_to_be_verified=["self", "kwargs"])
 
                 # Sets the hyperparameters
 
@@ -512,6 +513,13 @@ class ModelCustomTraining:
             self.model, self.loss_metric, self.training_input, 
             model_true_values=self.training_trueValues, verbose=verbose)
 
+        # Otherwise, initializes the flat tensor of model parameters as
+        # a None object
+
+        else:
+
+            self.model_parameters = None
+
     # Defines a method to evaluate the hessian of each output neuron of
     # the model
 
@@ -576,7 +584,7 @@ class ModelCustomTraining:
     # proper for use with Keras' optimizers
 
     @tf.function
-    def loss_function_keras(self, model_parameters):
+    def loss_function_keras(self):
 
         # Gets the model response
 
@@ -589,12 +597,12 @@ class ModelCustomTraining:
     # Defines a method to evaluate the loss function given the trainable
     # parameters as input
 
-    def loss_function_scipy(self, model_parameters):
+    def loss_function_scipy(self):
 
         # Gets the loss value and returns it
 
         return self.loss_class.evaluate_scalar_function(
-        model_parameters)
+        self.model_parameters)
     
     # Defines a function to evaluate the loss function on other sets of
     # data
@@ -752,7 +760,7 @@ class ModelCustomTraining:
 
         start_time = time.time()
 
-        initial_loss = self.loss_function(self.model_parameters).numpy()
+        initial_loss = self.loss_function().numpy()
 
         # Iterates through the optimization loop
 
@@ -803,8 +811,7 @@ class ModelCustomTraining:
 
                     # Gets the loss function value and the gradient
 
-                    loss_value = self.loss_function(
-                    self.model_parameters)
+                    loss_value = self.loss_function()
 
                     # Gets the gradient from the second position of the 
                     # call method
@@ -812,6 +819,14 @@ class ModelCustomTraining:
                     evaluated_gradient = self.loss_class(
                     self.model_parameters)[1]
 
+                # If it is a Keras' optimizer, the gradient must be 
+                # flattened
+
+                else:
+
+                    evaluated_gradient = tf.concat([tf.reshape(tensor, 
+                    [-1]) for tensor in evaluated_gradient], axis=0)
+
                 # Gets the gradient norm
 
                 gradient_value = tf.norm(evaluated_gradient).numpy()
@@ -858,8 +873,7 @@ class ModelCustomTraining:
 
             # Gets the final loss function
 
-            final_loss = self.loss_function(self.model_parameters
-            ).numpy()
+            final_loss = self.loss_function().numpy()
 
             print("\n#################################################"+
             "#######################\n#                        Trainin"+

{davout-0.1.1.dev169 → davout-0.1.1.dev170}/source/Davout/PythonicUtilities/function_tools.py

@@ -81,7 +81,7 @@ False):
 # arguments? Does it have any keys that are not keyword arguments?
 
 def verify_dictionary_as_function_argument(function_object, 
-input_dictionary):
+input_dictionary, list_of_arguments_not_to_be_verified=[]):
 
     # Gets the dictionary of keyword arguments and the list of positi-
     # onal arguments
@@ -93,7 +93,8 @@ input_dictionary):
 
     for argument_name in positional_arguments_list:
 
-        if not (argument_name in input_dictionary):
+        if (not (argument_name in input_dictionary)) and (not (
+        argument_name in list_of_arguments_not_to_be_verified)):
 
             # Gets a string with the positional arguments
 

{davout-0.1.1.dev169 → davout-0.1.1.dev170}/source/Davout/PythonicUtilities/user_interaction_tools.py

@@ -176,18 +176,17 @@ class PrintForLoopInfo:
         # number of message lines
 
         if (not isinstance(list_of_results_to_be_printed, list)) or len(
-        list_of_results_to_be_printed)!=(
-        self.number_of_characters_per_line):
+        list_of_results_to_be_printed)!=self.number_of_lines:
 
             raise IndexError("'list_of_results_to_be_printed' in 'Prin"+
             "tForLoopInfo' is not a list or it has not the same length"+
             " as the number of lines of the message list, "+str(
-            self.number_of_characters_per_line))
+            self.number_of_lines))
 
         # Prints the first horizontal bar
 
-        print("\n#####################################################"+
-        "###################\n")
+        print("\n\n###################################################"+
+        "#####################")
 
         # Iterates over the message lines and the corresponding results
 
@@ -229,7 +228,7 @@ class PrintForLoopInfo:
                     clearance_space_right += " "
 
                 print("#"+clearance_space_left+message_line+
-                result_string+clearance_space_right+"#\n")
+                result_string+clearance_space_right+"#")
 
             # Otherwise, if there is no enough space for message in ad-
             # dition to the result
@@ -288,7 +287,7 @@ class PrintForLoopInfo:
                 print("#"+clearance_space_left_message+message_line+
                 clearance_space_right_message+"#\n#"+
                 clearance_space_left_result+result_string+
-                clearance_space_right_result+"#\n")
+                clearance_space_right_result+"#")
 
         # Prints the final horizontal bar
 

{davout-0.1.1.dev169 → davout-0.1.1.dev170/source/Davout.egg-info}/PKG-INFO

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