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

ci: Fix L0_infer--base #7904

Merged
merged 6 commits into from
Jan 3, 2025
Merged

ci: Fix L0_infer--base #7904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac63dad
Set names for model output tensors explicitly
yinggeh Dec 18, 2024
ce627cd
Bump up openvino model version
yinggeh Dec 23, 2024
86670c4
Merge branch 'main' of github.com:triton-inference-server/server into…
yinggeh Dec 25, 2024
8c7023e
Merge branch 'main' of github.com:triton-inference-server/server into…
yinggeh Dec 30, 2024
2c701c0
Merge branch 'main' of github.com:triton-inference-server/server into…
yinggeh Jan 3, 2025
76f353c
Minor updates
yinggeh Jan 3, 2025
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 LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
Copyright (c) 2025, 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
20 changes: 19 additions & 1 deletion qa/common/gen_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2023-2025, 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 All @@ -24,6 +24,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import os
from typing import List

# Common utilities for model generation scripts
Expand Down Expand Up @@ -168,3 +169,20 @@ def np_to_torch_dtype(np_dtype):
elif np_dtype == np_dtype_string:
return List[str]
return None


def openvino_save_model(model_version_dir, model):
import openvino as ov

# W/A for error moving to OpenVINO new APIs "Attempt to get a name for a Tensor without names".
# For more details, check https://github.com/triton-inference-server/openvino_backend/issues/89
if len(model.outputs) == 0:
model.outputs[0].get_tensor().set_names({"OUTPUT"})
else:
for idx, out in enumerate(model.outputs):
out.get_tensor().set_names({f"OUTPUT{idx}"})

os.makedirs(model_version_dir, exist_ok=True)
ov.serialize(
model, model_version_dir + "/model.xml", model_version_dir + "/model.bin"
)
13 changes: 3 additions & 10 deletions qa/common/gen_qa_dyna_sequence_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2019-2025, 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 @@ -36,6 +36,7 @@
np_to_tf_dtype,
np_to_torch_dtype,
np_to_trt_dtype,
openvino_save_model,
)

FLAGS = None
Expand Down Expand Up @@ -1304,15 +1305,7 @@ def create_openvino_modelfile(models_dir, model_version, max_batch, dtype, shape
op0 = ov.opset1.multiply(tmp, ready, name="OUTPUT")

model = ov.Model([op0], [in0, start, end, ready, corrid], model_name)

try:
os.makedirs(model_version_dir)
except OSError as ex:
pass # ignore existing dir

ov.serialize(
model, model_version_dir + "/model.xml", model_version_dir + "/model.bin"
)
openvino_save_model(model_version_dir, model)


def create_openvino_modelconfig(models_dir, model_version, max_batch, dtype, shape):
Expand Down
10 changes: 3 additions & 7 deletions qa/common/gen_qa_identity_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2019-2025, 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 @@ -37,6 +37,7 @@
np_to_onnx_dtype,
np_to_tf_dtype,
np_to_trt_dtype,
openvino_save_model,
)

FLAGS = None
Expand Down Expand Up @@ -581,12 +582,7 @@ def create_openvino_modelfile(
)

model = ov.Model(openvino_outputs, openvino_inputs, model_name)

os.makedirs(model_version_dir, exist_ok=True)

ov.serialize(
model, model_version_dir + "/model.xml", model_version_dir + "/model.bin"
)
openvino_save_model(model_version_dir, model)


def create_openvino_modelconfig(
Expand Down
4 changes: 2 additions & 2 deletions qa/common/gen_qa_model_repository
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2018-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2018-2025, 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 @@ -55,7 +55,7 @@ ONNX_VERSION=1.16.1
ONNX_OPSET=0

# OPENVINO version
OPENVINO_VERSION=2024.4.0
OPENVINO_VERSION=2024.5.0

UBUNTU_IMAGE=${UBUNTU_IMAGE:=ubuntu:22.04}
PYTORCH_IMAGE=${PYTORCH_IMAGE:=nvcr.io/nvidia/pytorch:$TRITON_VERSION-py3}
Expand Down
13 changes: 3 additions & 10 deletions qa/common/gen_qa_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2018-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2018-2025, 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 @@ -39,6 +39,7 @@
np_to_tf_dtype,
np_to_torch_dtype,
np_to_trt_dtype,
openvino_save_model,
)

FLAGS = None
Expand Down Expand Up @@ -1826,15 +1827,7 @@ def create_openvino_modelfile(
op1 = ov.opset1.convert(result1, destination_type=output1_dtype, name="OUTPUT1")

model = ov.Model([op0, op1], [in0, in1], model_name)

try:
os.makedirs(model_version_dir)
except OSError as ex:
pass # ignore existing dir

ov.serialize(
model, model_version_dir + "/model.xml", model_version_dir + "/model.bin"
)
openvino_save_model(model_version_dir, model)


def create_openvino_modelconfig(
Expand Down
13 changes: 3 additions & 10 deletions qa/common/gen_qa_reshape_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2019-2025, 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 @@ -38,6 +38,7 @@
np_to_tf_dtype,
np_to_torch_dtype,
np_to_trt_dtype,
openvino_save_model,
)

FLAGS = None
Expand Down Expand Up @@ -949,15 +950,7 @@ def create_openvino_modelfile(
)

model = ov.Model(openvino_outputs, openvino_inputs, model_name)

try:
os.makedirs(model_version_dir)
except OSError as ex:
pass # ignore existing dir

ov.serialize(
model, model_version_dir + "/model.xml", model_version_dir + "/model.bin"
)
openvino_save_model(model_version_dir, model)


def create_openvino_modelconfig(
Expand Down
13 changes: 3 additions & 10 deletions qa/common/gen_qa_sequence_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright 2019-2025, 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 @@ -37,6 +37,7 @@
np_to_tf_dtype,
np_to_torch_dtype,
np_to_trt_dtype,
openvino_save_model,
)

FLAGS = None
Expand Down Expand Up @@ -1153,15 +1154,7 @@ def create_openvino_modelfile(models_dir, model_version, max_batch, dtype, shape
op0 = ov.opset1.multiply(tmp, ready, name="OUTPUT")

model = ov.Model([op0], [in0, start, ready], model_name)

try:
os.makedirs(model_version_dir)
except OSError as ex:
pass # ignore existing dir

ov.serialize(
model, model_version_dir + "/model.xml", model_version_dir + "/model.bin"
)
openvino_save_model(model_version_dir, model)


def create_openvino_modelconfig(models_dir, model_version, max_batch, dtype, shape):
Expand Down
Loading