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" 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]) 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) 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 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