From 55d1aac216c45b65cd41226a8c03ff7ef4cc81cc Mon Sep 17 00:00:00 2001 From: Henry Wallace <67589487+henry-wallace-phys@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:23:45 +0000 Subject: [PATCH 1/5] Update tf_autotune_interface.py --- .../machine_learning/tensorflow/tf_autotune_interface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_autotune_interface.py b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_autotune_interface.py index 0bd65cf..9e6012e 100644 --- a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_autotune_interface.py +++ b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_autotune_interface.py @@ -1,4 +1,4 @@ -from MaCh3PythonUtils.machine_learning.tf_interface import TfInterface +from MaCh3PythonUtils.machine_learning.tensorflow.tf_interface import TfInterface import tensorflow as tf import pandas as pd import numpy as np @@ -101,4 +101,4 @@ def train_model(self): self._model = self._model_tuner.hypermodel.build(best_hps) - self._model.fit(scaled_data, scaled_labels, epochs=self._epochs, batch_size=self._batch_size , validation_split=0.2, callbacks=[stop_early, lr_schedule]) \ No newline at end of file + self._model.fit(scaled_data, scaled_labels, epochs=self._epochs, batch_size=self._batch_size , validation_split=0.2, callbacks=[stop_early, lr_schedule]) From d02dfbc000a7643def0c9368bfe01d936d55d1e3 Mon Sep 17 00:00:00 2001 From: Henry Wallace <67589487+henry-wallace-phys@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:24:45 +0000 Subject: [PATCH 2/5] Update tf_interface.py --- .../machine_learning/tensorflow/tf_interface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_interface.py b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_interface.py index 8ef6a9a..cecc5cb 100644 --- a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_interface.py +++ b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_interface.py @@ -1,5 +1,5 @@ # Let's make a tensor flow interface! -from MaCh3PythonUtils.machine_learning.file_ml_interface import FileMLInterface +from MaCh3PythonUtils.machine_learning.tensorflow.file_ml_interface import FileMLInterface import tensorflow as tf import pandas as pd import numpy as np @@ -100,4 +100,4 @@ def model_predict(self, test_data: pd.DataFrame): def model_predict_no_scale(self, test_data): # Same as above but specifically for TF, optimised to avoid if statement... - return self._model(test_data, training=False) \ No newline at end of file + return self._model(test_data, training=False) From ec8ad74b8b485e0cd76093e5e89a0c5f213265fc Mon Sep 17 00:00:00 2001 From: Henry Wallace <67589487+henry-wallace-phys@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:25:22 +0000 Subject: [PATCH 3/5] Update tf_manual_interface.py --- .../machine_learning/tensorflow/tf_manual_interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_manual_interface.py b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_manual_interface.py index 4f05408..47408e4 100644 --- a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_manual_interface.py +++ b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_manual_interface.py @@ -1,4 +1,4 @@ -from MaCh3PythonUtils.machine_learning.tf_interface import TfInterface +from MaCh3PythonUtils.machine_learning.tensorflow..tf_interface import TfInterface import tensorflow as tf import pandas as pd import numpy as np From 0eca8b5cf9373d5d749c8721b869f829beaefb3d Mon Sep 17 00:00:00 2001 From: Henry Wallace <67589487+henry-wallace-phys@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:26:03 +0000 Subject: [PATCH 4/5] Update tf_normalizing_flow_model.py --- .../machine_learning/tensorflow/tf_normalizing_flow_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_normalizing_flow_model.py b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_normalizing_flow_model.py index e40577b..930ea3f 100644 --- a/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_normalizing_flow_model.py +++ b/src/MaCh3PythonUtils/machine_learning/tensorflow/tf_normalizing_flow_model.py @@ -1,4 +1,4 @@ -from MaCh3PythonUtils.machine_learning.tf_manual_interface import TfManualInterface +from MaCh3PythonUtils.machine_learning.tensorflow.tf_manual_interface import TfManualInterface import tensorflow_probability as tfp import tensorflow.keras as tfk From 6f329d18804da238d41c352fe8500aa663452c94 Mon Sep 17 00:00:00 2001 From: Henry Wallace <67589487+henry-wallace-phys@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:26:42 +0000 Subject: [PATCH 5/5] Update __init__.py --- src/MaCh3PythonUtils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MaCh3PythonUtils/__init__.py b/src/MaCh3PythonUtils/__init__.py index 08b2af4..9cb47cf 100644 --- a/src/MaCh3PythonUtils/__init__.py +++ b/src/MaCh3PythonUtils/__init__.py @@ -1,2 +1,2 @@ -__version__="2.0.0" +__version__="2.0.1" __author__="Henry Wallace"