From a4a6e30609eaa9cc5b72d0d207f10dcafe50bf0c Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Wed, 20 Nov 2024 11:41:20 +0000 Subject: [PATCH 1/9] Upgrade tf versions. Signed-off-by: Jay Zhang --- .../workflows/keras_application_test_ci.yml | 24 +++++++++---------- .github/workflows/keras_unit_test_ci.yml | 24 +++++++++---------- .../workflows/pretrained_model_test_ci.yml | 24 +++++++++---------- .github/workflows/unit_test_ci.yml | 20 ++++++++-------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml index c962b1dc8..e16159e60 100644 --- a/.github/workflows/keras_application_test_ci.yml +++ b/.github/workflows/keras_application_test_ci.yml @@ -24,10 +24,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py38-TF2.9) + - name: Run Tests (Py38-TF2.12) uses: ./.github/actions/keras_application_test with: - tf_version: '2.9.0' + tf_version: '2.12.0' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -36,7 +36,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py38-TF2.9-ubuntu) + name: Test Results (Py38-TF2.12-ubuntu) path: ./**/test-results-*.xml Test_max_py_with_latest_tf: # Do not change this name because it is used in Ruleset of this repo. @@ -48,10 +48,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py310-TF2.15) + - name: Run Tests (Py310-TF2.18) uses: ./.github/actions/keras_application_test with: - tf_version: '2.15.0' + tf_version: '2.18.0' python_version: '3.10' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -60,7 +60,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py310-TF2.15-ubuntu) + name: Test Results (Py310-TF2.18-ubuntu) path: ./**/test-results-*.xml Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo. @@ -92,17 +92,17 @@ jobs: fail-fast: false matrix: name: - - 'py39-tf2.10' - - 'py39-tf2.15' + - 'py39-tf2.16' + - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] include: - - name: 'py39-tf2.10' - tf_version: '2.10.0' + - name: 'py39-tf2.16' + tf_version: '2.16.0' python_version: '3.9' - - name: 'py39-tf2.15' - tf_version: '2.15.0' + - name: 'py39-tf2.18' + tf_version: '2.18.0' python_version: '3.9' runs-on: ${{ matrix.os }} diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml index 7ef38d79a..9aa2a671c 100644 --- a/.github/workflows/keras_unit_test_ci.yml +++ b/.github/workflows/keras_unit_test_ci.yml @@ -23,10 +23,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py38-TF2.9) + - name: Run Tests (Py38-TF2.12) uses: ./.github/actions/keras_unit_test with: - tf_version: '2.9.0' + tf_version: '2.12.0' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -35,7 +35,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py38-TF2.9-ubuntu) + name: Test Results (Py38-TF2.12-ubuntu) path: ./**/test-results-*.xml Test_max_py_with_latest_tf: # Do not change this name because it is used in Ruleset of this repo. @@ -47,10 +47,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py310-TF2.15) + - name: Run Tests (Py310-TF2.18) uses: ./.github/actions/keras_unit_test with: - tf_version: '2.15.0' + tf_version: '2.18.0' python_version: '3.10' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -59,7 +59,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py310-TF2.15-ubuntu) + name: Test Results (Py310-TF2.18-ubuntu) path: ./**/test-results-*.xml Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo. @@ -91,17 +91,17 @@ jobs: fail-fast: false matrix: name: - - 'py39-tf2.10' - - 'py39-tf2.15' + - 'py39-tf2.16' + - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] include: - - name: 'py39-tf2.10' - tf_version: '2.10.0' + - name: 'py39-tf2.16' + tf_version: '2.16.0' python_version: '3.9' - - name: 'py39-tf2.15' - tf_version: '2.15.0' + - name: 'py39-tf2.18' + tf_version: '2.18.0' python_version: '3.9' runs-on: ${{ matrix.os }} diff --git a/.github/workflows/pretrained_model_test_ci.yml b/.github/workflows/pretrained_model_test_ci.yml index e82968fc3..832f004dd 100644 --- a/.github/workflows/pretrained_model_test_ci.yml +++ b/.github/workflows/pretrained_model_test_ci.yml @@ -24,11 +24,11 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py38-TF2.9-18) + - name: Run Tests (Py38-TF2.12-18) uses: ./.github/actions/pretrained_model_test with: os: 'ubuntu-latest' - tf_version: '2.9.0' + tf_version: '2.12.0' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -39,7 +39,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py38-TF2.9-18-ubuntu) + name: Test Results (Py38-TF2.12-18-ubuntu) path: ./**/test-results-*.xml Test_max_py_with_latest_tf: # Do not change this name because it is used in Ruleset of this repo. @@ -51,11 +51,11 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py310-TF2.15-18) + - name: Run Tests (Py310-TF2.18-18) uses: ./.github/actions/pretrained_model_test with: os: 'ubuntu-latest' - tf_version: '2.15.0' + tf_version: '2.18.0' python_version: '3.10' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -66,7 +66,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py310-TF2.15-18-ubuntu) + name: Test Results (Py310-TF2.18-18-ubuntu) path: ./**/test-results-*.xml Extra_tests: @@ -74,19 +74,19 @@ jobs: fail-fast: false matrix: name: - - 'py38-tf2.13' - - 'py39-tf2.15' + - 'py38-tf2.16' + - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] opset_version: ['18', '15'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py38-tf2.13' - tf_version: '2.13.0' + - name: 'py38-tf2.16' + tf_version: '2.16.0' python_version: '3.8' - - name: 'py39-tf2.15' - tf_version: '2.15.0' + - name: 'py39-tf2.18' + tf_version: '2.18.0' python_version: '3.9' - name: 'py37-tf1.15' tf_version: '1.15.5' diff --git a/.github/workflows/unit_test_ci.yml b/.github/workflows/unit_test_ci.yml index 1dcbef980..99a7e89b3 100644 --- a/.github/workflows/unit_test_ci.yml +++ b/.github/workflows/unit_test_ci.yml @@ -28,7 +28,7 @@ jobs: uses: ./.github/actions/unit_test with: os: 'ubuntu-latest' - tf_version: '2.9.0' + tf_version: '2.11.0' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -51,11 +51,11 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Tests (Py310-TF2.15-18) + - name: Run Tests (Py310-TF2.18-18) uses: ./.github/actions/unit_test with: os: 'ubuntu-latest' - tf_version: '2.15.0' + tf_version: '2.18.0' python_version: '3.10' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -66,7 +66,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: Test Results (Py310-TF2.15-18-ubuntu) + name: Test Results (Py310-TF2.18-18-ubuntu) path: ./**/test-results-*.xml Extra_tests: @@ -74,19 +74,19 @@ jobs: fail-fast: false matrix: name: - - 'py38-tf2.13' - - 'py39-tf2.15' + - 'py38-tf2.16' + - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] opset_version: ['18', '15'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py38-tf2.13' - tf_version: '2.13.0' + - name: 'py38-tf2.16' + tf_version: '2.16.0' python_version: '3.8' - - name: 'py39-tf2.15' - tf_version: '2.15.0' + - name: 'py39-tf2.18' + tf_version: '2.18.0' python_version: '3.9' - name: 'py37-tf1.15' tf_version: '1.15.5' From 445a89ede56b831a08b64f52058dc20ce01cd60a Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Wed, 20 Nov 2024 11:55:27 +0000 Subject: [PATCH 2/9] Change the version to 2.17.0. Signed-off-by: Jay Zhang --- .github/workflows/keras_application_test_ci.yml | 6 +++--- .github/workflows/keras_unit_test_ci.yml | 6 +++--- .github/workflows/pretrained_model_test_ci.yml | 6 +++--- .github/workflows/unit_test_ci.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml index e16159e60..1afd08fb9 100644 --- a/.github/workflows/keras_application_test_ci.yml +++ b/.github/workflows/keras_application_test_ci.yml @@ -92,14 +92,14 @@ jobs: fail-fast: false matrix: name: - - 'py39-tf2.16' + - 'py39-tf2.17' - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] include: - - name: 'py39-tf2.16' - tf_version: '2.16.0' + - name: 'py39-tf2.17' + tf_version: '2.17.0' python_version: '3.9' - name: 'py39-tf2.18' tf_version: '2.18.0' diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml index 9aa2a671c..b0a3784a0 100644 --- a/.github/workflows/keras_unit_test_ci.yml +++ b/.github/workflows/keras_unit_test_ci.yml @@ -91,14 +91,14 @@ jobs: fail-fast: false matrix: name: - - 'py39-tf2.16' + - 'py39-tf2.17' - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] include: - - name: 'py39-tf2.16' - tf_version: '2.16.0' + - name: 'py39-tf2.17' + tf_version: '2.17.0' python_version: '3.9' - name: 'py39-tf2.18' tf_version: '2.18.0' diff --git a/.github/workflows/pretrained_model_test_ci.yml b/.github/workflows/pretrained_model_test_ci.yml index 832f004dd..914a915ad 100644 --- a/.github/workflows/pretrained_model_test_ci.yml +++ b/.github/workflows/pretrained_model_test_ci.yml @@ -74,7 +74,7 @@ jobs: fail-fast: false matrix: name: - - 'py38-tf2.16' + - 'py38-tf2.17' - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] opset_version: ['18', '15'] @@ -82,8 +82,8 @@ jobs: onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py38-tf2.16' - tf_version: '2.16.0' + - name: 'py38-tf2.17' + tf_version: '2.17.0' python_version: '3.8' - name: 'py39-tf2.18' tf_version: '2.18.0' diff --git a/.github/workflows/unit_test_ci.yml b/.github/workflows/unit_test_ci.yml index 99a7e89b3..1a894a579 100644 --- a/.github/workflows/unit_test_ci.yml +++ b/.github/workflows/unit_test_ci.yml @@ -74,7 +74,7 @@ jobs: fail-fast: false matrix: name: - - 'py38-tf2.16' + - 'py38-tf2.17' - 'py39-tf2.18' os: ['ubuntu-latest', 'windows-2022'] opset_version: ['18', '15'] @@ -82,8 +82,8 @@ jobs: onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py38-tf2.16' - tf_version: '2.16.0' + - name: 'py38-tf2.17' + tf_version: '2.17.0' python_version: '3.8' - name: 'py39-tf2.18' tf_version: '2.18.0' From 77e5c394ece0c7a2173c4b9725beb79572325a0f Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 25 Nov 2024 10:14:25 +0000 Subject: [PATCH 3/9] Update keras.backend for keras 3. Signed-off-by: Jay Zhang --- tests/keras2onnx_unit_tests/conftest.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/keras2onnx_unit_tests/conftest.py b/tests/keras2onnx_unit_tests/conftest.py index 758c31f7f..65420f9d7 100644 --- a/tests/keras2onnx_unit_tests/conftest.py +++ b/tests/keras2onnx_unit_tests/conftest.py @@ -12,6 +12,12 @@ K = keras.backend +def is_keras_3(): + return tf.__version__.startswith("2.18") or tf.__version__.startswith("2.17") or tf.__version__.startswith("2.16") + +if is_keras_3(): + import tf_keras + K = tf_keras.backend @pytest.fixture(scope='function') def runner(): From c68331deb35a6bf4268a34550d9d4633a091c552 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 25 Nov 2024 10:23:59 +0000 Subject: [PATCH 4/9] Install tf_keras. Signed-off-by: Jay Zhang --- .github/actions/keras_application_test/action.yml | 1 + .github/actions/keras_unit_test/action.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/actions/keras_application_test/action.yml b/.github/actions/keras_application_test/action.yml index 7148e417b..54208958e 100644 --- a/.github/actions/keras_application_test/action.yml +++ b/.github/actions/keras_application_test/action.yml @@ -58,6 +58,7 @@ runs: pip install numpy==1.19.0 else pip install transformers + pip install tf_keras pip install "numpy<2" fi diff --git a/.github/actions/keras_unit_test/action.yml b/.github/actions/keras_unit_test/action.yml index 4c78945f1..d808c6f1d 100644 --- a/.github/actions/keras_unit_test/action.yml +++ b/.github/actions/keras_unit_test/action.yml @@ -24,6 +24,7 @@ runs: python -m pip install --upgrade pip pip install onnxconverter-common pip install onnx==${{ inputs.onnx_version }} + pip install tf_keras pip install h5py==3.7.0 pip install parameterized pip install timeout-decorator From 0d6c98e330952ea9351ed188f1ef4b810a29171c Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 25 Nov 2024 10:31:35 +0000 Subject: [PATCH 5/9] Change the way to call legacy functions. Signed-off-by: Jay Zhang --- tests/keras2onnx_unit_tests/conftest.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/keras2onnx_unit_tests/conftest.py b/tests/keras2onnx_unit_tests/conftest.py index 65420f9d7..6ba7452cb 100644 --- a/tests/keras2onnx_unit_tests/conftest.py +++ b/tests/keras2onnx_unit_tests/conftest.py @@ -15,10 +15,6 @@ def is_keras_3(): return tf.__version__.startswith("2.18") or tf.__version__.startswith("2.17") or tf.__version__.startswith("2.16") -if is_keras_3(): - import tf_keras - K = tf_keras.backend - @pytest.fixture(scope='function') def runner(): np.random.seed(42) @@ -31,10 +27,15 @@ def runner(): def runner_func(*args, **kwargs): return run_onnx_runtime(*args, model_files, **kwargs) - # Ensure Keras layer naming is reset for each function - K.reset_uids() - # Reset the TensorFlow session to avoid resource leaking between tests - K.clear_session() + if is_keras_3(): + import tf_keras + tf_keras.backend.reset_uids() + tf_keras.backend.clear_session() + else: + # Ensure Keras layer naming is reset for each function + K.reset_uids() + # Reset the TensorFlow session to avoid resource leaking between tests + K.clear_session() # Provide wrapped run_onnx_runtime function yield runner_func From e5fc2da839938981527c5e95ba5c997b31902ed0 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Wed, 18 Dec 2024 11:27:07 +0000 Subject: [PATCH 6/9] Enable keras v1 api tests. Signed-off-by: Jay Zhang --- .github/actions/unit_test/action.yml | 2 ++ tests/utils/setup_test_env.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/actions/unit_test/action.yml b/.github/actions/unit_test/action.yml index 00cb28386..ebcad6c80 100644 --- a/.github/actions/unit_test/action.yml +++ b/.github/actions/unit_test/action.yml @@ -46,6 +46,7 @@ runs: export TF2ONNX_SKIP_TFLITE_TESTS=${{ inputs.skip_tflite }} export TF2ONNX_SKIP_TFJS_TESTS=True export TF2ONNX_SKIP_TF_TESTS=False + export TF_USE_LEGACY_KERAS=True python -m pytest --cov=tf2onnx --cov-report=term --disable-pytest-warnings -r s tests --cov-append --junitxml=junit/test-results.xml ls @@ -58,5 +59,6 @@ runs: set TF2ONNX_SKIP_TFLITE_TESTS=${{ inputs.skip_tflite }} set TF2ONNX_SKIP_TFJS_TESTS=True set TF2ONNX_SKIP_TF_TESTS=False + set TF_USE_LEGACY_KERAS=True python -m pytest --cov=tf2onnx --cov-report=term --disable-pytest-warnings -r s tests --cov-append --junitxml=junit/test-results.xml ls diff --git a/tests/utils/setup_test_env.sh b/tests/utils/setup_test_env.sh index a14828d05..d74df3447 100755 --- a/tests/utils/setup_test_env.sh +++ b/tests/utils/setup_test_env.sh @@ -28,6 +28,8 @@ pip install tensorflow==$TF_VERSION pip uninstall -y protobuf pip install "protobuf~=3.20" +pip install tf_keras + python setup.py install echo "----- List all of depdencies:" From 26444c2d48f6ba412024a0b6fab35fd00049469e Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Thu, 19 Dec 2024 05:27:18 +0000 Subject: [PATCH 7/9] Update ubuntu version for python 3.7. Signed-off-by: Jay Zhang --- .github/actions/keras_application_test/action.yml | 2 ++ .github/actions/keras_unit_test/action.yml | 4 +++- .github/workflows/keras_application_test_ci.yml | 2 +- .github/workflows/keras_unit_test_ci.yml | 2 +- .github/workflows/pretrained_model_test_ci.yml | 2 +- .github/workflows/unit_test_ci.yml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/actions/keras_application_test/action.yml b/.github/actions/keras_application_test/action.yml index 54208958e..57c93dc42 100644 --- a/.github/actions/keras_application_test/action.yml +++ b/.github/actions/keras_application_test/action.yml @@ -72,5 +72,7 @@ runs: run: | python -c "import onnxruntime" pytest tests/keras2onnx_unit_tests --doctest-modules --junitxml=junit/test-results.xml + + export TF_USE_LEGACY_KERAS=True cd tests/keras2onnx_applications/nightly_build python run_all_v2.py diff --git a/.github/actions/keras_unit_test/action.yml b/.github/actions/keras_unit_test/action.yml index d808c6f1d..4888e3a7a 100644 --- a/.github/actions/keras_unit_test/action.yml +++ b/.github/actions/keras_unit_test/action.yml @@ -36,7 +36,8 @@ runs: pip install "protobuf~=3.20" if [[ ${{ inputs.tf_version }} == 1.* ]]; then pip install numpy==1.19.0 - else + else + pip install tf_keras pip install "numpy<2" fi @@ -49,6 +50,7 @@ runs: shell: bash if: runner.os == 'Linux' run: | + export TF_USE_LEGACY_KERAS=True python -c "import onnxruntime" python -c "import onnxconverter_common" pytest tests/keras2onnx_unit_tests --doctest-modules --junitxml=junit/test-results.xml diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml index 1afd08fb9..28dd4f4cb 100644 --- a/.github/workflows/keras_application_test_ci.yml +++ b/.github/workflows/keras_application_test_ci.yml @@ -66,7 +66,7 @@ jobs: Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo. strategy: fail-fast: false - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml index b0a3784a0..e04c91160 100644 --- a/.github/workflows/keras_unit_test_ci.yml +++ b/.github/workflows/keras_unit_test_ci.yml @@ -65,7 +65,7 @@ jobs: Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo. strategy: fail-fast: false - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code diff --git a/.github/workflows/pretrained_model_test_ci.yml b/.github/workflows/pretrained_model_test_ci.yml index 914a915ad..f20638b04 100644 --- a/.github/workflows/pretrained_model_test_ci.yml +++ b/.github/workflows/pretrained_model_test_ci.yml @@ -91,7 +91,7 @@ jobs: - name: 'py37-tf1.15' tf_version: '1.15.5' python_version: '3.7' - os: 'ubuntu-latest' + os: 'ubuntu-22.04' opset_version: '15' ort_version: '1.14.1' onnx_version: '1.14.1' diff --git a/.github/workflows/unit_test_ci.yml b/.github/workflows/unit_test_ci.yml index 1a894a579..3df090408 100644 --- a/.github/workflows/unit_test_ci.yml +++ b/.github/workflows/unit_test_ci.yml @@ -91,7 +91,7 @@ jobs: - name: 'py37-tf1.15' tf_version: '1.15.5' python_version: '3.7' - os: 'ubuntu-latest' + os: 'ubuntu-22.04' opset_version: '15' ort_version: '1.14.1' onnx_version: '1.14.1' From 63264aa969d0c8bed0ecc95ae3f9a0615dfc3276 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 23 Dec 2024 06:08:22 +0000 Subject: [PATCH 8/9] Limited the max version of py 3.8 to 2.13.1. Signed-off-by: Jay Zhang --- .github/workflows/keras_unit_test_ci.yml | 2 +- .github/workflows/pretrained_model_test_ci.yml | 6 +++--- .github/workflows/unit_test_ci.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml index e04c91160..7ba8d0d1a 100644 --- a/.github/workflows/keras_unit_test_ci.yml +++ b/.github/workflows/keras_unit_test_ci.yml @@ -26,7 +26,7 @@ jobs: - name: Run Tests (Py38-TF2.12) uses: ./.github/actions/keras_unit_test with: - tf_version: '2.12.0' + tf_version: '2.13.1' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' diff --git a/.github/workflows/pretrained_model_test_ci.yml b/.github/workflows/pretrained_model_test_ci.yml index f20638b04..1f70fb282 100644 --- a/.github/workflows/pretrained_model_test_ci.yml +++ b/.github/workflows/pretrained_model_test_ci.yml @@ -28,7 +28,7 @@ jobs: uses: ./.github/actions/pretrained_model_test with: os: 'ubuntu-latest' - tf_version: '2.12.0' + tf_version: '2.13.1' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -82,9 +82,9 @@ jobs: onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py38-tf2.17' + - name: 'py39-tf2.17' tf_version: '2.17.0' - python_version: '3.8' + python_version: '3.9' - name: 'py39-tf2.18' tf_version: '2.18.0' python_version: '3.9' diff --git a/.github/workflows/unit_test_ci.yml b/.github/workflows/unit_test_ci.yml index 3df090408..f0c2698f8 100644 --- a/.github/workflows/unit_test_ci.yml +++ b/.github/workflows/unit_test_ci.yml @@ -28,7 +28,7 @@ jobs: uses: ./.github/actions/unit_test with: os: 'ubuntu-latest' - tf_version: '2.11.0' + tf_version: '2.13.1' python_version: '3.8' ort_version: '1.16.3' onnx_version: '1.16.1' @@ -82,9 +82,9 @@ jobs: onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py38-tf2.17' + - name: 'py39-tf2.17' tf_version: '2.17.0' - python_version: '3.8' + python_version: '3.9' - name: 'py39-tf2.18' tf_version: '2.18.0' python_version: '3.9' From 17dffb291c3c2e48d99814112728be4b8f481905 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 23 Dec 2024 07:55:33 +0000 Subject: [PATCH 9/9] Limit python version. Signed-off-by: Jay Zhang --- .github/workflows/pretrained_model_test_ci.yml | 12 ++++++------ .github/workflows/unit_test_ci.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pretrained_model_test_ci.yml b/.github/workflows/pretrained_model_test_ci.yml index 1f70fb282..361bb34b9 100644 --- a/.github/workflows/pretrained_model_test_ci.yml +++ b/.github/workflows/pretrained_model_test_ci.yml @@ -74,17 +74,17 @@ jobs: fail-fast: false matrix: name: - - 'py38-tf2.17' + - 'py39-tf2.17' - 'py39-tf2.18' - os: ['ubuntu-latest', 'windows-2022'] + os: ['ubuntu-22.04', 'windows-2022'] opset_version: ['18', '15'] ort_version: ['1.16.3'] onnx_version: ['1.16.1'] skip_tflite: ['False'] include: - - name: 'py39-tf2.17' - tf_version: '2.17.0' - python_version: '3.9' + - name: 'py38-tf2.13' + tf_version: '2.13.1' + python_version: '3.8' - name: 'py39-tf2.18' tf_version: '2.18.0' python_version: '3.9' @@ -96,7 +96,7 @@ jobs: ort_version: '1.14.1' onnx_version: '1.14.1' - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} steps: - name: Checkout code diff --git a/.github/workflows/unit_test_ci.yml b/.github/workflows/unit_test_ci.yml index f0c2698f8..bb23ba77a 100644 --- a/.github/workflows/unit_test_ci.yml +++ b/.github/workflows/unit_test_ci.yml @@ -76,7 +76,7 @@ jobs: name: - 'py38-tf2.17' - 'py39-tf2.18' - os: ['ubuntu-latest', 'windows-2022'] + os: ['ubuntu-22.04', 'windows-2022'] opset_version: ['18', '15'] ort_version: ['1.16.3'] onnx_version: ['1.16.1']