diff --git a/qa/L0_backend_identity/identity_test.py b/qa/L0_backend_identity/identity_test.py index 5b82890266..a607e4189b 100755 --- a/qa/L0_backend_identity/identity_test.py +++ b/qa/L0_backend_identity/identity_test.py @@ -32,9 +32,9 @@ import numpy as np import requests as httpreq -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_client_nobatch/client_test.py b/qa/L0_client_nobatch/client_test.py index c821d446d2..3288fc2ebf 100755 --- a/qa/L0_client_nobatch/client_test.py +++ b/qa/L0_client_nobatch/client_test.py @@ -34,9 +34,9 @@ import numpy as np import test_util as tu -import tritongrpcclient -import tritonhttpclient -from tritonclientutils import InferenceServerException +import tritonclient.grpc as tritongrpcclient +import tritonclient.http as tritonhttpclient +from tritonclient.utils import InferenceServerException class ClientNoBatchTest(tu.TestResultCollector): diff --git a/qa/L0_cuda_shared_memory/cuda_shared_memory_test.py b/qa/L0_cuda_shared_memory/cuda_shared_memory_test.py index 87fb7c1d3c..e17692ef56 100755 --- a/qa/L0_cuda_shared_memory/cuda_shared_memory_test.py +++ b/qa/L0_cuda_shared_memory/cuda_shared_memory_test.py @@ -35,10 +35,10 @@ import numpy as np import test_util as tu -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient import tritonshmutils.cuda_shared_memory as cshm -from tritonclientutils import * +from tritonclient.utils import * class CudaSharedMemoryTest(tu.TestResultCollector): diff --git a/qa/L0_custom_ops/cuda_op_test.py b/qa/L0_custom_ops/cuda_op_test.py index 896ed2adf0..bc610b3f0b 100755 --- a/qa/L0_custom_ops/cuda_op_test.py +++ b/qa/L0_custom_ops/cuda_op_test.py @@ -31,9 +31,9 @@ from builtins import range import numpy as np -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_custom_ops/mod_op_test.py b/qa/L0_custom_ops/mod_op_test.py index 14855f7c40..f0f2ccb79d 100755 --- a/qa/L0_custom_ops/mod_op_test.py +++ b/qa/L0_custom_ops/mod_op_test.py @@ -31,9 +31,9 @@ from builtins import range import numpy as np -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_custom_ops/onnx_op_test.py b/qa/L0_custom_ops/onnx_op_test.py index 9b246c8e31..d717447156 100755 --- a/qa/L0_custom_ops/onnx_op_test.py +++ b/qa/L0_custom_ops/onnx_op_test.py @@ -31,9 +31,9 @@ from builtins import range import numpy as np -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_custom_ops/zero_out_test.py b/qa/L0_custom_ops/zero_out_test.py index 28d5d2c9e6..86fdcb8a30 100755 --- a/qa/L0_custom_ops/zero_out_test.py +++ b/qa/L0_custom_ops/zero_out_test.py @@ -31,9 +31,9 @@ from builtins import range import numpy as np -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_large_payload/large_payload_test.py b/qa/L0_large_payload/large_payload_test.py index fff57290ef..f9c0a49dfd 100755 --- a/qa/L0_large_payload/large_payload_test.py +++ b/qa/L0_large_payload/large_payload_test.py @@ -35,9 +35,9 @@ import numpy as np import test_util as tu -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import InferenceServerException, np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import InferenceServerException, np_to_triton_dtype class LargePayLoadTest(tu.TestResultCollector): diff --git a/qa/L0_nullchar_string/nullchar_string_client.py b/qa/L0_nullchar_string/nullchar_string_client.py index 2d69b41b3d..1ab76bcf03 100755 --- a/qa/L0_nullchar_string/nullchar_string_client.py +++ b/qa/L0_nullchar_string/nullchar_string_client.py @@ -28,9 +28,9 @@ import argparse import numpy as np -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_rate_limiter/rate_limiter_test.py b/qa/L0_rate_limiter/rate_limiter_test.py index 4bc7b82e70..309e7f0a3d 100755 --- a/qa/L0_rate_limiter/rate_limiter_test.py +++ b/qa/L0_rate_limiter/rate_limiter_test.py @@ -38,8 +38,8 @@ import numpy as np import sequence_util as su -import tritongrpcclient as grpcclient -from tritonclientutils import * +import tritonclient.grpc as grpcclient +from tritonclient.utils import * _inference_count = 80 _inference_concurrency = 8 diff --git a/qa/L0_repoagent_checksum/identity_test.py b/qa/L0_repoagent_checksum/identity_test.py index 4db55e0d45..95a0639edf 100755 --- a/qa/L0_repoagent_checksum/identity_test.py +++ b/qa/L0_repoagent_checksum/identity_test.py @@ -30,9 +30,9 @@ import sys import numpy as np -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import np_to_triton_dtype FLAGS = None diff --git a/qa/L0_sequence_stress/sequence_stress.py b/qa/L0_sequence_stress/sequence_stress.py index 039cf793a2..bd71e9bcc2 100755 --- a/qa/L0_sequence_stress/sequence_stress.py +++ b/qa/L0_sequence_stress/sequence_stress.py @@ -39,8 +39,8 @@ import numpy as np import test_util as tu -import tritongrpcclient as grpcclient -from tritonclientutils import np_to_triton_dtype +import tritonclient.grpc as grpcclient +from tritonclient.utils import np_to_triton_dtype if sys.version_info >= (3, 0): import queue diff --git a/qa/L0_server_status/server_status_test.py b/qa/L0_server_status/server_status_test.py index 7ab04708f0..c54a4e8c0a 100755 --- a/qa/L0_server_status/server_status_test.py +++ b/qa/L0_server_status/server_status_test.py @@ -36,9 +36,9 @@ import infer_util as iu import numpy as np import test_util as tu -import tritongrpcclient as grpcclient -import tritonhttpclient as httpclient -from tritonclientutils import * +import tritonclient.grpc as grpcclient +import tritonclient.http as httpclient +from tritonclient.utils import * class ServerMetadataTest(tu.TestResultCollector): diff --git a/qa/L0_trt_shape_tensors/trt_shape_tensor_test.py b/qa/L0_trt_shape_tensors/trt_shape_tensor_test.py index a83795f981..d3563dce9e 100755 --- a/qa/L0_trt_shape_tensors/trt_shape_tensor_test.py +++ b/qa/L0_trt_shape_tensors/trt_shape_tensor_test.py @@ -40,7 +40,7 @@ import numpy as np import sequence_util as su import test_util as tu -import tritongrpcclient as grpcclient +import tritonclient.grpc as grpcclient TEST_SYSTEM_SHARED_MEMORY = bool(int(os.environ.get("TEST_SYSTEM_SHARED_MEMORY", 0)))