From c35edef3fc91feef7c20aa9d57dab59b1788a57d Mon Sep 17 00:00:00 2001 From: Kento Nozawa Date: Sat, 26 Oct 2024 13:39:01 +0900 Subject: [PATCH 1/2] Add python 3.12 to tfkeras CI and remove warning message --- .github/workflows/tfkeras.yml | 2 +- tfkeras/tfkeras_integration.py | 2 +- tfkeras/tfkeras_simple.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tfkeras.yml b/.github/workflows/tfkeras.yml index d6bd4cad..2b431df1 100644 --- a/.github/workflows/tfkeras.yml +++ b/.github/workflows/tfkeras.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 diff --git a/tfkeras/tfkeras_integration.py b/tfkeras/tfkeras_integration.py index dc9971e8..c561a1b8 100644 --- a/tfkeras/tfkeras_integration.py +++ b/tfkeras/tfkeras_integration.py @@ -15,8 +15,8 @@ import urllib import optuna -from optuna.integration import TFKerasPruningCallback from optuna.trial import TrialState +from optuna.integration import TFKerasPruningCallback import tensorflow_datasets as tfds import tensorflow as tf diff --git a/tfkeras/tfkeras_simple.py b/tfkeras/tfkeras_simple.py index e78b35e3..47b3deea 100644 --- a/tfkeras/tfkeras_simple.py +++ b/tfkeras/tfkeras_simple.py @@ -15,6 +15,7 @@ from tensorflow.keras.datasets import mnist from tensorflow.keras.layers import Conv2D from tensorflow.keras.layers import Dense +from tensorflow.keras.layers import Input from tensorflow.keras.layers import Flatten from tensorflow.keras.models import Sequential from tensorflow.keras.optimizers import RMSprop @@ -47,13 +48,13 @@ def objective(trial): input_shape = (img_x, img_y, 1) model = Sequential() + model.add(Input(input_shape)) model.add( Conv2D( filters=trial.suggest_categorical("filters", [32, 64]), kernel_size=trial.suggest_categorical("kernel_size", [3, 5]), strides=trial.suggest_categorical("strides", [1, 2]), activation=trial.suggest_categorical("activation", ["relu", "linear"]), - input_shape=input_shape, ) ) model.add(Flatten()) From 49468a2c2a2a3c02e5ac286b0b4eddce313b2bad Mon Sep 17 00:00:00 2001 From: Kento Nozawa Date: Sat, 26 Oct 2024 13:43:22 +0900 Subject: [PATCH 2/2] isort --- tfkeras/tfkeras_integration.py | 2 +- tfkeras/tfkeras_simple.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tfkeras/tfkeras_integration.py b/tfkeras/tfkeras_integration.py index c561a1b8..dc9971e8 100644 --- a/tfkeras/tfkeras_integration.py +++ b/tfkeras/tfkeras_integration.py @@ -15,8 +15,8 @@ import urllib import optuna -from optuna.trial import TrialState from optuna.integration import TFKerasPruningCallback +from optuna.trial import TrialState import tensorflow_datasets as tfds import tensorflow as tf diff --git a/tfkeras/tfkeras_simple.py b/tfkeras/tfkeras_simple.py index 47b3deea..7aa1c221 100644 --- a/tfkeras/tfkeras_simple.py +++ b/tfkeras/tfkeras_simple.py @@ -15,8 +15,8 @@ from tensorflow.keras.datasets import mnist from tensorflow.keras.layers import Conv2D from tensorflow.keras.layers import Dense -from tensorflow.keras.layers import Input from tensorflow.keras.layers import Flatten +from tensorflow.keras.layers import Input from tensorflow.keras.models import Sequential from tensorflow.keras.optimizers import RMSprop