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

ci: Add INT64 Datatype Support for Shape Tensors in TensorRT Backend #7329

Merged
merged 15 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
2 changes: 1 addition & 1 deletion qa/L0_model_config/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ for modelpath in \
autofill_noplatform/tensorrt/mixed_batch_hint_shape_values/1 \
autofill_noplatform_success/tensorrt/no_config_shape_tensor/1 ; do
mkdir -p $modelpath
cp /data/inferenceserver/${REPO_VERSION}/qa_shapetensor_model_repository/plan_zero_1_float32/1/model.plan \
cp /data/inferenceserver/${REPO_VERSION}/qa_shapetensor_model_repository/plan_zero_1_float32_int32/1/model.plan \
$modelpath/.
done

Expand Down
4 changes: 2 additions & 2 deletions qa/L0_perf_analyzer/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ cp -r /data/inferenceserver/${REPO_VERSION}/qa_variable_model_repository/graphde
cp -r /data/inferenceserver/${REPO_VERSION}/qa_variable_model_repository/graphdef_int32_int32_float32 $DATADIR/

# Copy shape tensor models
cp -r /data/inferenceserver/${REPO_VERSION}/qa_shapetensor_model_repository/plan_zero_1_float32 $DATADIR/
cp -r /data/inferenceserver/${REPO_VERSION}/qa_shapetensor_model_repository/plan_zero_1_float32_int32 $DATADIR/

# Copying ensemble including a sequential model
cp -r /data/inferenceserver/${REPO_VERSION}/qa_sequence_model_repository/savedmodel_sequence_object $DATADIR
Expand Down Expand Up @@ -564,7 +564,7 @@ for PROTOCOL in grpc http; do
# Shape tensor I/O model (server needs the shape tensor on the CPU)
for SHARED_MEMORY_TYPE in none system; do
set +e
$PERF_ANALYZER -v -i $PROTOCOL -m plan_zero_1_float32 --input-data=$SHAPETENSORADTAFILE \
$PERF_ANALYZER -v -i $PROTOCOL -m plan_zero_1_float32_int32 --input-data=$SHAPETENSORADTAFILE \
--shape DUMMY_INPUT0:4,4 -p2000 --shared-memory=$SHARED_MEMORY_TYPE -b 8 -s ${STABILITY_THRESHOLD} \
>$CLIENT_LOG 2>&1
if [ $? -ne 0 ]; then
Expand Down
6 changes: 3 additions & 3 deletions qa/L0_perf_analyzer_capi/test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -73,7 +73,7 @@ cp -r /data/inferenceserver/${REPO_VERSION}/qa_variable_model_repository/graphde
cp -r /data/inferenceserver/${REPO_VERSION}/qa_variable_model_repository/graphdef_int32_int32_float32 $DATADIR/

# Copy shape tensor models
cp -r /data/inferenceserver/${REPO_VERSION}/qa_shapetensor_model_repository/plan_zero_1_float32 $DATADIR/
cp -r /data/inferenceserver/${REPO_VERSION}/qa_shapetensor_model_repository/plan_zero_1_float32_int32 $DATADIR/

# Copying ensemble including a sequential model
cp -r /data/inferenceserver/${REPO_VERSION}/qa_sequence_model_repository/savedmodel_sequence_object $DATADIR
Expand Down Expand Up @@ -201,7 +201,7 @@ if [ $(cat $CLIENT_LOG | grep "${ERROR_STRING}" | wc -l) -ne 0 ]; then
fi

# Shape tensor I/O model (server needs the shape tensor on the CPU)
$PERF_ANALYZER -v -m plan_zero_1_float32 --input-data=$SHAPETENSORADTAFILE \
$PERF_ANALYZER -v -m plan_zero_1_float32_int32 --input-data=$SHAPETENSORADTAFILE \
--shape DUMMY_INPUT0:4,4 -p2000 -b 8 \
--service-kind=triton_c_api --model-repository=$DATADIR \
--triton-server-directory=$SERVER_LIBRARY_PATH -s ${STABILITY_THRESHOLD} \
Expand Down
17 changes: 14 additions & 3 deletions qa/L0_trt_shape_tensors/test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -127,10 +127,17 @@ else
fi

# Prepare the config file for dynamic batching tests
CONFIG_FILE="models/plan_zero_1_float32/config.pbtxt"
CONFIG_FILE="models/plan_zero_1_float32_int32/config.pbtxt"
pskiran1 marked this conversation as resolved.
Show resolved Hide resolved
sed -i "s/^max_batch_size:.*/max_batch_size: 8/" $CONFIG_FILE && \
sed -i "s/^version_policy:.*/version_policy: { specific { versions: [1] }}/" $CONFIG_FILE && \
echo "dynamic_batching { preferred_batch_size: [ 2, 6 ], max_queue_delay_microseconds: 10000000 }" >> $CONFIG_FILE

# Prepare the config file for dynamic batching tests
CONFIG_FILE="models/plan_zero_1_float32_int64/config.pbtxt"
sed -i "s/^max_batch_size:.*/max_batch_size: 8/" $CONFIG_FILE && \
sed -i "s/^version_policy:.*/version_policy: { specific { versions: [1] }}/" $CONFIG_FILE && \
echo "dynamic_batching { preferred_batch_size: [ 2, 6 ], max_queue_delay_microseconds: 10000000 }" >> $CONFIG_FILE

for i in \
test_dynamic_different_shape_values \
test_dynamic_identical_shape_values; do
Expand Down Expand Up @@ -202,7 +209,11 @@ for i in \
done

# Prepare the config file for dynamic sequence batching tests
CONFIG_FILE="models/plan_dyna_sequence_float32/config.pbtxt"
CONFIG_FILE="models/plan_dyna_sequence_float32_int32/config.pbtxt"
pskiran1 marked this conversation as resolved.
Show resolved Hide resolved
sed -i "s/max_candidate_sequences:.*/max_candidate_sequences:4/" $CONFIG_FILE && \
sed -i "s/max_queue_delay_microseconds:.*/max_queue_delay_microseconds:5000000/" $CONFIG_FILE

CONFIG_FILE="models/plan_dyna_sequence_float32_int64/config.pbtxt"
sed -i "s/max_candidate_sequences:.*/max_candidate_sequences:4/" $CONFIG_FILE && \
sed -i "s/max_queue_delay_microseconds:.*/max_queue_delay_microseconds:5000000/" $CONFIG_FILE

Expand Down
Loading
Loading