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.

Sign up for GitHub

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

Bring back Python backend based PyTorch backend #6518

Merged
merged 15 commits into from
Jan 11, 2024
Merged

Bring back Python backend based PyTorch backend #6518

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4ed5f21
Patch L0_model_config with runtime
kthui Nov 3, 2023
ec777d5
Add L0_pytorch_python_runtime
kthui Nov 14, 2023
b674ea4
Update expected runtime field
kthui Dec 5, 2023
b52159d
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Dec 6, 2023
e3fc774
Add test for escaping runtime
kthui Dec 7, 2023
b59f7d7
Add comments on unit test imports
kthui Dec 8, 2023
50670f6
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Dec 8, 2023
dde5b33
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Dec 11, 2023
1f4607a
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Jan 3, 2024
cc6b256
Add invalid runtime test
kthui Jan 3, 2024
8d2f155
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Jan 3, 2024
282b2e5
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Jan 6, 2024
c368f47
User to build PyTorch env
kthui Jan 6, 2024
e1d82df
Merge branch 'main' of github.com:triton-inference-server/server into…
kthui Jan 8, 2024
530a6f0
Update copyright
kthui Jan 8, 2024
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
3 changes: 1 addition & 2 deletions qa/L0_model_config/autofill_noplatform/custom/unknown_backend.unknown/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Invalid argument: unable to find 'libtriton_unknown.so' or 'unknown/model.py' for model 'unknown_backend.unknown'

Invalid argument: unable to find backend library for backend 'unknown', try specifying runtime on the model configuration.
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/custom/empty_config.identity/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ output_pinned_memory {
}
}
backend: "identity"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/custom/no_backend.identity/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ output_pinned_memory {
}
}
backend: "identity"
runtime: ""
rmccorm4 marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/onnx/cpu_instance/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ optimization {
enable: true
}
}
backend: "onnxruntime"
backend: "onnxruntime"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should auto-complete fill in this field with correct value as well (i.e., this would be /opt/tritonserver/backends/onnxruntime/libtriton_onnxruntime.so)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was my original thought, but the issue is how does auto-complete determine if the model uses C++ or Python runtime? A simple solution is to have backend specific auto-complete implementation. For example, if it the model uses PyTorch backend and a *.pt model file is provided without any *.py file, then use C++. If a *.py file is provided, then use Python. See this commit. From previous discussions with @nnshah1 and @rmccorm4, we want to stop adding more backend specific logic into auto-complete and opt for a generic implementation, which Python runtime falls into the category of custom backend on auto-complete. Backends can implement either C++ or Python runtime (or both), we do not want to auto-complete into Python runtime on a C++ only backend, which requires checking the backend installation directory. The current structure limits auto-complete to only see model directory, but not backend directory, because the latter is resolved only when the model is loaded, which happens after auto-complete. A easier approach is to resolve runtime, if not already filled, when the model is loaded, which has both the model and backend directory information.

Going back to the original question, auto-complete does not touch the runtime field, it is determined/filled when the model is loaded, if it is not already filled.

runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/empty_config/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/empty_config/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/empty_config/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/empty_config/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config_no_batch/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config_no_batch/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config_no_batch/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/onnx/no_config_no_batch/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "onnxruntime"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/dynamic_batch/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/dynamic_batch/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/dynamic_batch/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/dynamic_batch/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/empty_config/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/empty_config/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/empty_config/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/empty_config/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/no_config/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/no_config/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/no_config/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/no_config/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/partial_config/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/openvino/partial_config/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ optimization {
enable: true
}
}
backend: "openvino"
backend: "openvino"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching_no_op/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching_no_op/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching_no_op/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
3 changes: 2 additions & 1 deletion qa/L0_model_config/autofill_noplatform_success/python/dynamic_batching_no_op/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ optimization {
enable: true
}
}
backend: "python"
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/empty_config/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/empty_config/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/empty_config/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/empty_config/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/incomplete_input/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/incomplete_output/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ optimization {
}
}
backend: "python"
runtime: ""
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/model_transaction_policy/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/model_transaction_policy/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/model_transaction_policy/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
1 change: 1 addition & 0 deletions qa/L0_model_config/autofill_noplatform_success/python/model_transaction_policy/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
1 change: 1 addition & 0 deletions ...nfig/autofill_noplatform_success/python/model_transaction_policy_decoupled_false/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
}
1 change: 1 addition & 0 deletions ...ig/autofill_noplatform_success/python/model_transaction_policy_decoupled_false/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
}
1 change: 1 addition & 0 deletions ...ig/autofill_noplatform_success/python/model_transaction_policy_decoupled_false/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
}
1 change: 1 addition & 0 deletions ...ig/autofill_noplatform_success/python/model_transaction_policy_decoupled_false/expected.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
}
1 change: 1 addition & 0 deletions ...0_model_config/autofill_noplatform_success/python/model_transaction_policy_no_op/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
1 change: 1 addition & 0 deletions ...model_config/autofill_noplatform_success/python/model_transaction_policy_no_op/expected.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
1 change: 1 addition & 0 deletions ...model_config/autofill_noplatform_success/python/model_transaction_policy_no_op/expected.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ optimization {
}
}
backend: "python"
runtime: ""
model_transaction_policy {
decoupled: true
}
Loading
Loading