Skip to content

Commit

Permalink
Update example model repository and HTTP / GRPC examples to use model…
Browse files Browse the repository at this point in the history
…s in example repository (#2188)

* Remove use of simple_custom model in simple clients

* Update example model repository and HTTP / GRPC examples to use models in example repository

* Fix up
  • Loading branch information
GuanLuo authored Oct 29, 2020
1 parent df1bd75 commit d4927c2
Show file tree
Hide file tree
Showing 32 changed files with 166 additions and 635 deletions.
39 changes: 13 additions & 26 deletions Dockerfile.QA
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,28 @@ RUN mkdir -p qa/common && \
cp /workspace/src/clients/go/*.go qa/L0_simple_go_client/. && \
mkdir qa/L0_backend_release/simple_models && \
cp -r docs/examples/model_repository/simple qa/L0_backend_release/simple_models/. && \
mkdir qa/L0_backend_release/simple_seq_models && \
cp -r /workspace/docs/examples/model_repository/simple_sequence qa/L0_backend_release/simple_seq_models/. && \
mkdir qa/L0_shared_memory/models && \
cp -r docs/examples/model_repository/simple qa/L0_shared_memory/models/. && \
mkdir qa/L0_cuda_shared_memory/models && \
cp -r docs/examples/model_repository/simple qa/L0_cuda_shared_memory/models/. && \
cp -r /workspace/docs/examples/model_repository/simple qa/L0_client_timeout/models && \
cp -r /workspace/docs/examples/model_repository/simple_sequence qa/L0_client_timeout/models/. && \
mkdir qa/L0_grpc/models && \
cp -r /workspace/docs/examples/model_repository/simple qa/L0_grpc/models && \
cp -r /workspace/docs/examples/model_repository/simple_dyna_sequence qa/L0_grpc/models && \
cp -r /workspace/docs/examples/model_repository/simple_int8 qa/L0_grpc/models && \
cp -r /workspace/docs/examples/model_repository/simple_sequence qa/L0_grpc/models && \
cp -r /workspace/docs/examples/model_repository/simple_string qa/L0_grpc/models && \
cp -r /workspace/docs/examples/model_repository/inception_graphdef qa/L0_grpc/models && \
mkdir qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/simple qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/inception_graphdef qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/simple_dyna_sequence qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/simple_identity qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/simple_sequence qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/simple_string qa/L0_http/models && \
cp -r /workspace/docs/examples/model_repository/inception_graphdef qa/L0_http/models && \
mkdir qa/L0_https/models && \
cp -r docs/examples/model_repository/simple qa/L0_https/models/. && \
mkdir qa/L0_secure_grpc/models && \
Expand All @@ -120,12 +131,6 @@ RUN mkdir -p qa/custom_models/custom_int32_int32_int32/1 && \
mkdir -p qa/custom_models/custom_nobatch_float32_float32_float32/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libaddsub.so \
qa/custom_models/custom_nobatch_float32_float32_float32/1/. && \
mkdir -p qa/L0_grpc/models/simple_custom/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libaddsub.so \
qa/L0_grpc/models/simple_custom/1/. && \
mkdir -p qa/L0_http/models/simple_custom/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libaddsub.so \
qa/L0_http/models/simple_custom/1/. && \
mkdir -p qa/L0_simple_ensemble/models/simple/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libaddsub.so \
qa/L0_simple_ensemble/models/simple/1/. && \
Expand All @@ -146,25 +151,7 @@ RUN mkdir -p qa/L0_backend_identity/models && \
cp /tmp/tritonbuild/install/backends/identity/libtriton_identity.so \
qa/L0_backend_identity/models/identity_fp32/1/.

RUN mkdir -p qa/L0_backend_release/simple_seq_models/simple_sequence/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libsequence.so \
qa/L0_backend_release/simple_seq_models/simple_sequence/1/. && \
mkdir -p qa/L0_client_timeout/models/simple_sequence/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libsequence.so \
qa/L0_client_timeout/models/simple_sequence/1/. && \
mkdir -p qa/L0_grpc/models/simple_sequence/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libsequence.so \
qa/L0_grpc/models/simple_sequence/1/. && \
mkdir -p qa/L0_grpc/models_dyna/simple_sequence/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libdyna_sequence.so \
qa/L0_grpc/models_dyna/simple_sequence/1/. && \
mkdir -p qa/L0_http/models/simple_sequence/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libsequence.so \
qa/L0_http/models/simple_sequence/1/. && \
mkdir -p qa/L0_http/models_dyna/simple_sequence/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libdyna_sequence.so \
qa/L0_http/models_dyna/simple_sequence/1/. && \
mkdir -p qa/custom_models/custom_sequence_int32/1 && \
RUN mkdir -p qa/custom_models/custom_sequence_int32/1 && \
cp /tmp/tritonbuild/tritonserver/build/test-util/install/lib/libsequence.so \
qa/custom_models/custom_sequence_int32/1/. && \
mkdir -p qa/custom_models/custom_dyna_sequence_int32/1 && \
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

name: "simple_sequence"
platform: "custom"
name: "simple_dyna_sequence"
platform: "tensorflow_graphdef"
max_batch_size: 8
default_model_filename: "libdyna_sequence.so"
sequence_batching {
max_sequence_idle_microseconds: 10000000
oldest {
Expand Down
Binary file not shown.
19 changes: 19 additions & 0 deletions docs/examples/model_repository/simple_identity/config.pbtxt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

name: "simple_identity"
platform: "tensorflow_savedmodel"
max_batch_size: 8

input [
{
name: "INPUT0"
data_type: TYPE_STRING
dims: [ -1 ]
}
]
output [
{
name: "OUTPUT0"
data_type: TYPE_STRING
dims: [ -1 ]
}
]
21 changes: 21 additions & 0 deletions docs/examples/model_repository/simple_int8/1/model.graphdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

@
INPUT0 Placeholder*
dtype0*
shape: ���������
@
INPUT1 Placeholder*
dtype0*
shape: ���������
#
ADDAddINPUT0INPUT1*
T0
#
SUBSubINPUT0INPUT1*
T0
!
OUTPUT0IdentityADD*
T0
!
OUTPUT1IdentitySUB*
T0"�
27 changes: 27 additions & 0 deletions docs/examples/model_repository/simple_int8/config.pbtxt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "simple_int8"
platform: "tensorflow_graphdef"
max_batch_size: 8
input [
{
name: "INPUT0"
data_type: TYPE_INT8
dims: [ 16 ]
},
{
name: "INPUT1"
data_type: TYPE_INT8
dims: [ 16 ]
}
]
output [
{
name: "OUTPUT0"
data_type: TYPE_INT8
dims: [ 16 ]
},
{
name: "OUTPUT1"
data_type: TYPE_INT8
dims: [ 16 ]
}
]
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

name: "simple_sequence"
platform: "custom"
platform: "tensorflow_graphdef"
max_batch_size: 8
default_model_filename: "libsequence.so"
sequence_batching {
control_input [
{
Expand Down

This file was deleted.

59 changes: 0 additions & 59 deletions qa/L0_grpc/models/simple_custom/config.pbtxt

This file was deleted.

71 changes: 0 additions & 71 deletions qa/L0_grpc/models/simple_sequence/config.pbtxt

This file was deleted.

Loading

0 comments on commit d4927c2

Please sign in to comment.