Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the model copies in L0_sequence_batcher test #4125

Merged
merged 2 commits into from
Mar 29, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions qa/L0_sequence_batcher/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function get_datatype () {
elif [[ $1 == "savedmodel" ]]; then
dtype="float32 bool"
elif [[ $1 == "graphdef" ]]; then
dtype="object bool"
dtype="object bool int32"
fi

# Add type string to the onnx model tests only for implicit state.
Expand Down Expand Up @@ -210,13 +210,12 @@ for BACKEND in $BACKENDS; do
MODELS="$MODELS $DATADIR/$FIXED_MODEL_REPOSITORY/${BACKEND}_sequence_${DTYPE}"
done

if [[ $BACKEND == "graphdef" ]]; then
MODELS="$MODELS $DATADIR/$FIXED_MODEL_REPOSITORY/${BACKEND}_sequence_graphdef_sequence_int32"
fi

if [ "$ENSEMBLES" == "1" ]; then
for DTYPE in $DTYPES; do
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/$FIXED_MODEL_REPOSITORY/*_${BACKEND}_sequence_${DTYPE}"
# We don't generate ensemble models for bool data type.
if [[ $DTYPE != "bool" ]]; then
tanmayv25 marked this conversation as resolved.
Show resolved Hide resolved
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/$FIXED_MODEL_REPOSITORY/*_${BACKEND}_sequence_${DTYPE}"
fi
done
fi
fi
Expand Down Expand Up @@ -317,18 +316,14 @@ for BACKEND in $BACKENDS; do
MODELS="$MODELS $DATADIR/$FIXED_MODEL_REPOSITORY/${BACKEND}_nobatch_sequence_${DTYPE}"
done

if [[ $BACKEND == "graphdef" ]]; then
MODELS="$MODELS $DATADIR/$FIXED_MODEL_REPOSITORY/graphdef_nobatch_sequence_int32"
fi

if [ "$ENSEMBLES" == "1" ]; then
for DTYPE in $DTYPES; do
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/$FIXED_MODEL_REPOSITORY/*_${BACKEND}_nobatch_sequence_${DTYPE}"
# We don't generate ensemble models for bool data type.
if [[ $DTYPE != "bool" ]]; then
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/$FIXED_MODEL_REPOSITORY/*_${BACKEND}_nobatch_sequence_${DTYPE}"
fi
done

if [[ $BACKEND == "graphdef" ]]; then
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/$FIXED_MODEL_REPOSITORY/*_graphdef_nobatch_sequence_int32"
fi
fi
fi
done
Expand Down Expand Up @@ -361,8 +356,11 @@ for BACKEND in $BACKENDS; do

if [ "$ENSEMBLES" == "1" ]; then
for DTYPE in $DTYPES; do
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/${VAR_MODEL_REPOSITORY}/*_${BACKEND}_sequence_${DTYPE}"
done
# We don't generate ensemble models for bool data type.
if [[ $DTYPE != "bool" ]]; then
MODELS="$MODELS $DATADIR/qa_ensemble_model_repository/${VAR_MODEL_REPOSITORY}/*_${BACKEND}_sequence_${DTYPE}"
fi
done
fi
fi
done
Expand Down