Skip to content

Commit a16af2d

Browse files
authored
v23.01 (#13)
Signed-off-by: Josh Minor <[email protected]>
1 parent 8290f21 commit a16af2d

16 files changed

+1385
-275
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,22 @@ jobs:
242242
apt install -yqq --no-install-recommends libssl-dev zlib1g-dev rapidjson-dev python3-dev python3-pip wget build-essential git
243243
python3 -m pip install --upgrade pip setuptools wheel
244244
python3 -m pip install --upgrade grpcio-tools
245-
python3 -m pip install --upgrade numpy pillow attrdict future grpcio requests gsutil awscli six grpcio-channelz
245+
python3 -m pip install --upgrade numpy pillow attrdict future grpcio requests gsutil awscli six grpcio-channelz filelock jinja2 psutil
246246
python3 -m pip install --upgrade tritonclient[all]
247-
python3 -m pip install --upgrade pytest pytest-xdist pytest-xprocess jinja2
247+
python3 -m pip install --upgrade pytest pytest-xdist
248248
249-
- name: Run Tests
249+
- name: Fetch test models
250+
working-directory: ./qa
250251
run: |
251-
cd qa
252252
wget -q https://images.getsmarter.io/ml-models/armnn_tflite_backend_triton_model_repo.tar.gz
253253
tar -xzf armnn_tflite_backend_triton_model_repo.tar.gz
254-
python3 -m pytest -v tests/ --model-repo-path $(pwd)/triton_qa_models/accuracy_test_model_repo --triton-path /opt/tritonserver/bin/tritonserver --backend-directory /opt/tritonserver/backends
254+
255+
- name: Run HTTP Tests
256+
working-directory: ./qa
257+
run: |
258+
python3 -m pytest -x -n $(( $(nproc) / 2 )) -v tests/ --model-repo-path $(pwd)/triton_qa_models/accuracy_test_model_repo --triton-path /opt/tritonserver/bin/tritonserver --backend-directory /opt/tritonserver/backends
259+
260+
- name: Run gRPC Tests
261+
working-directory: ./qa
262+
run: |
263+
python3 -m pytest -x -n $(( $(nproc) / 2 )) -v tests/ --client-type grpc --model-repo-path $(pwd)/triton_qa_models/accuracy_test_model_repo --triton-path /opt/tritonserver/bin/tritonserver --backend-directory /opt/tritonserver/backends

.github/workflows/triton_build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: |
2424
git clone https://github.com/triton-inference-server/server
2525
cd server
26-
readarray -d '' -t branches < <( git branch -r --list | grep -E 'r2[2-9]+\.[0-9]+$' | tr '\n' ' ')
26+
readarray -d '' -t branches < <( git branch -r --list | grep -E 'origin/r2[2-9]+\.[0-9]+$' | tr '\n' ' ')
2727
branches+=("origin/main")
2828
echo "All branches: ${branches[@]}"
2929
declare -a branches_to_build
@@ -53,6 +53,7 @@ jobs:
5353
build:
5454
needs: get_triton_branches
5555
strategy:
56+
fail-fast: false
5657
matrix:
5758
branch: ${{ fromJson(needs.get_triton_branches.outputs.triton_branches) }}
5859
build_arch:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.vscode
44
*.so
55
**/__pycache__
6+
**/.pytest_cache
67
**/*.pyc
78
/deps
89
/.devcontainer

qa/config-template.pbtxt

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ output [
2424
{% endfor %}
2525
2626
]
27+
28+
{% if model.tflite_num_threads %}
29+
parameters: {
30+
key: "tflite_num_threads"
31+
value: {
32+
string_value:"{{ model.tflite_num_threads }}"
33+
}
34+
}
35+
{% endif %}
36+
2737
instance_group [
2838
{% if model.gpu > 0 %}
2939
{
@@ -46,15 +56,15 @@ optimization { execution_accelerators {
4656
{% if model.armnn_cpu %}
4757
cpu_execution_accelerator : [ {
4858
name : "armnn"
49-
{% for k,v in model.armnn_cpu_parameters %}
59+
{% for k,v in model.armnn_cpu_parameters.items() %}
5060
parameters { key: "{{k}}" value: "{{v}}" }
5161
{% endfor %}
5262
}]
5363
{% endif %}
5464
{% if model.armnn_gpu %}
5565
gpu_execution_accelerator : [ {
5666
name : "armnn"
57-
{% for k,v in model.armnn_gpu_parameters %}
67+
{% for k,v in model.armnn_gpu_parameters.items() %}
5868
parameters { key: "{{k}}" value: "{{v}}" }
5969
{% endfor %}
6070
}]
@@ -65,9 +75,30 @@ optimization { execution_accelerators {
6575
optimization { execution_accelerators {
6676
cpu_execution_accelerator : [ {
6777
name : "xnnpack"
68-
{% for k,v in model.xnnpack_parameters %}
78+
{% for k,v in model.xnnpack_parameters.items() %}
6979
parameters { key: "{{k}}" value: "{{v}}" }
7080
{% endfor %}
7181
}]
7282
}}
7383
{% endif %}
84+
85+
{% if model.warm_up %}
86+
model_warmup [
87+
{
88+
name: "regular sample"
89+
count: 5
90+
batch_size: {{ 1 if model.max_batch_size == 0 else model.max_batch_size }}
91+
{% for input in model.inputs %}
92+
inputs {
93+
key: "{{ input.name }}"
94+
value: {
95+
data_type: {{ input.datatype }}
96+
dims: [ {{ input.dims|join(', ') }} ]
97+
random_data: true
98+
}
99+
}
100+
{% endfor %}
101+
}
102+
]
103+
{% endif %}
104+

0 commit comments

Comments
 (0)