Merge pull request #48 from franneck94/fixTest

Fix test

CHANGELOG.md

@@ -1,5 +1,9 @@
 # TensorCross Change Log
 
+## Version 2.0.0: May 20, 2024
+
+- This will be the stable version for TF 2.13+ which is the first version that supports keras 3.0
+
 ## Version 1.0.0: October 29, 2023
 
 - Some rework, updates docs and versioning. This will be the stable version for TF (Keras) 2.8+

examples/example_grid_search.py

@@ -16,7 +16,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=1)
+    x_input = Input(shape=(1,))
     y_pred = Dense(units=1)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

examples/example_grid_search_cv.py

@@ -15,7 +15,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=1)
+    x_input = Input(shape=(1,))
     y_pred = Dense(units=1)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

examples/example_random_search.py

@@ -17,7 +17,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=1)
+    x_input = Input(shape=(1,))
     y_pred = Dense(units=1)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

examples/example_random_search_cv.py

@@ -16,7 +16,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=1)
+    x_input = Input(shape=(1,))
     y_pred = Dense(units=1)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

setup.py

@@ -34,7 +34,13 @@
 ISRELEASED = False
 
 MIN_PYTHON_VERSION = "3.9"
-INSTALL_REQUIRES = ["keras>=2.8", "numpy", "scipy", "scikit-learn>=1.0"]
+INSTALL_REQUIRES = [
+    "tensorflow>=2.13",
+    "keras>=3.0",
+    "numpy",
+    "scipy",
+    "scikit-learn>=1.0",
+]
 
 
 PACKAGES = find_packages(include=["tensorcross", "tensorcross.*"])

tensorcross/version.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "2.0.0"

tests/test_grid_search.py

@@ -49,7 +49,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=num_features)
+    x_input = Input(shape=(num_features,))
     y_pred = Dense(units=num_targets)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

tests/test_grid_search_cv.py

@@ -42,7 +42,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=num_features)
+    x_input = Input(shape=(num_features,))
     y_pred = Dense(units=num_targets)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

tests/test_random_search.py

@@ -52,7 +52,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=num_features)
+    x_input = Input(shape=(num_features,))
     y_pred = Dense(units=num_targets)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])
 

tests/test_random_search_cv.py

@@ -43,7 +43,7 @@ def build_model(
     learning_rate: float,
 ) -> Model:
     """Build the test model."""
-    x_input = Input(shape=num_features)
+    x_input = Input(shape=(num_features,))
     y_pred = Dense(units=num_targets)(x_input)
     model = Model(inputs=[x_input], outputs=[y_pred])