C-API output tensors reset #2683
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atobiszei
force-pushed
the
atobisze_output_tensors_reset
branch
from
a997dc2
to
b0a70de
Compare
atobiszei
force-pushed
the
atobisze_output_tensors_reset
branch
from
eaf5cd4
to
1ab3f0b
Compare
atobiszei
force-pushed
the
atobisze_output_tensors_reset
branch
from
bc84084
to
9ea8028
Compare
atobiszei
commented
Oct 17, 2024
atobiszei
commented
Oct 17, 2024
rasapala
approved these changes
Oct 21, 2024
mzegla
reviewed
Oct 21, 2024
src/BUILD
Outdated
| @@ -1578,7 +1578,7 @@ cc_library( | |||
| srcs = ["test/openvino_remote_tensors_tests.cpp"], | |||
| data = [ | |||
| "test/c_api/config_standard_dummy.json", | |||
There was a problem hiding this comment.
How about standard dummy config?
src/BUILD
Outdated
| @@ -1627,7 +1627,7 @@ cc_library( | |||
| srcs = ["test/openvino_tests.cpp"], | |||
| data = [ | |||
| "test/c_api/config_standard_dummy.json", | |||
There was a problem hiding this comment.
How about standard dummy config?
| if (!status.ok()) { | ||
| return reinterpret_cast<OVMS_Status*>(new Status(std::move(status))); | ||
| } | ||
| return nullptr; |
There was a problem hiding this comment.
Is nullptr interpreted as OK status?
| @@ -60,6 +60,13 @@ Status InferenceRequest::setOutputBuffer(const char* name, const void* addr, siz | |||
| } | |||
| return it->second.setBuffer(addr, byteSize, bufferType, deviceId); | |||
| } | |||
| Status InferenceRequest::removeOutputBuffer(const char* name) { | |||
| auto it = outputs.find(name); | |||
There was a problem hiding this comment.
Does it make sense to check name pointer validity first?
There was a problem hiding this comment.
It's checked at capi.cpp
| @@ -99,6 +106,13 @@ Status InferenceRequest::removeInput(const char* name) { | |||
| } | |||
| return StatusCode::NONEXISTENT_TENSOR_FOR_REMOVAL; | |||
| } | |||
| Status InferenceRequest::removeOutput(const char* name) { | |||
There was a problem hiding this comment.
It's checked at capi.cpp
| bool allOutputsSupported = true; | ||
| for (auto [name, _] : getOutputsInfo()) { | ||
| try { | ||
| ov::Tensor tensor = request.get_tensor(name); |
There was a problem hiding this comment.
Is it possible that we capture input name here? If model has an input called name?
There was a problem hiding this comment.
Output name is logged in L1442/1439
atobiszei
commented
Oct 21, 2024
mzegla
approved these changes
Oct 21, 2024
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🛠 Summary
Adding safeguard to C-API so that when setting output buffers is used we restore the original output buffers after the inference. Otherwise you would have to use output tensors always for any particular model. ov::InferRequest would store the previously set output buffer, and inference would trigger overwrite.
Ticket:CVS-141788, CVS-152665
🧪 Checklist
``