Skip to content

Commit 5377187

Browse files
committed
fix issues
Signed-off-by: xadupre <[email protected]>
1 parent f578b48 commit 5377187

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

.github/actions/keras_application_test/action.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,11 @@ runs:
4646
pip install git+https://github.com/qubvel/efficientnet
4747
pip install keras-self-attention
4848
pip install pytest pytest-cov pytest-runner
49-
pip uninstall -y protobuf
49+
pip uninstall -y protobuf h5py
5050
5151
if [[ ${{ inputs.tf_version }} == 1.* ]]; then
52-
pip install keras==2.3.1
53-
pip install transformers==4.2.0
54-
pip uninstall -y h5py
55-
pip install h5py==2.9.0
56-
pip install numpy==1.19.0 tensorflow==${{ inputs.tf_version }}
52+
echo "-- install-1 TF1-KERAS ${{ inputs.tf_version }}"
53+
pip install numpy==1.19.0 tensorflow==${{ inputs.tf_version }} protobuf h5py==2.9.0 transformers==4.2.0 keras h5py
5754
else
5855
pip install transformers
5956
if [[ "${{ inputs.tf_version }}" != "2.13.0" && "${{ inputs.tf_version }}" != "2.9.0" ]]; then

.github/actions/keras_unit_test/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ runs:
2424
python -m pip install --upgrade pip
2525
pip install onnxconverter-common
2626
pip install onnx==${{ inputs.onnx_version }}
27-
pip install h5py
2827
pip install parameterized
2928
pip install timeout-decorator
3029
pip install coloredlogs flatbuffers
3130
pip install pytest pytest-cov pytest-runner
3231
pip install onnxruntime==${{ inputs.ort_version }}
33-
pip uninstall -y protobuf
32+
pip uninstall -y protobuf h5py tensorflow
3433
if [[ ${{ inputs.tf_version }} == 1.* ]]; then
35-
pip install numpy==1.19.0 tensorflow==${{ inputs.tf_version }}
34+
echo "-- install-2 TF1-KERAS ${{ inputs.tf_version }}"
35+
pip install numpy==1.19.0 tensorflow==${{ inputs.tf_version }} protobuf keras h5py
3636
else
3737
if [[ "${{ inputs.tf_version }}" != "2.13.0" && "${{ inputs.tf_version }}" != "2.9.0" ]]; then
3838
echo "-- install-2 TF-KERAS ${{ inputs.tf_version }}"
39-
pip install tf_keras==${{ inputs.tf_version }} tensorflow==${{ inputs.tf_version }}
39+
pip install tf_keras==${{ inputs.tf_version }} tensorflow==${{ inputs.tf_version }} h5py
4040
else
4141
echo "-- install-2 TF ${{ inputs.tf_version }}"
42-
pip install protobuf tensorflow==${{ inputs.tf_version }}
42+
pip install protobuf tensorflow==${{ inputs.tf_version }} h5py
4343
fi
4444
fi
4545

tests/utils/setup_test_env.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ echo "==== ONNXRuntime version: $ORT_VERSION"
1616
echo "==== ONNX version: $ONNX_VERSION"
1717

1818
pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
19-
pip uninstall -y tensorflow
19+
pip uninstall -y tensorflow protobuf h5py
2020
pip install onnx==$ONNX_VERSION onnxruntime==$ORT_VERSION onnxruntime-extensions
2121

2222
if [[ $TF_VERSION == 1.* ]]; then
23-
pip install numpy==1.19.0 tensorflow==$TF_VERSION
23+
echo "-- install-3 TF1-KERAS $TF_VERSION"
24+
pip install numpy==1.19.0 tensorflow==$TF_VERSION protobug keras h5py
2425
else
2526
pip uninstall -y protobuf
2627
if [[ "$TF_VERSION" != "2.13.0" && "$TF_VERSION" != "2.9.0" ]]; then

0 commit comments

Comments
 (0)