-
Notifications
You must be signed in to change notification settings - Fork 170
feat: add BLS decoupled response iterator's cancel() method for the request cancellation #398
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3ac7505
responses cancellation
richardhuo-nv a6a1a00
fix commit hook
richardhuo-nv 02dcf1d
resolve comments
richardhuo-nv 6f47428
fix README
richardhuo-nv 37f3243
remove include
richardhuo-nv 5942052
resolve comments
richardhuo-nv 9482ee2
fix comment
richardhuo-nv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -140,3 +140,4 @@ dmypy.json | |
|
||
# vscode | ||
.vscode/settings.json | ||
.vscode/c_cpp_properties.json |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
// Copyright 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 | ||
// are met: | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above copyright | ||
// notice, this list of conditions and the following disclaimer in the | ||
// documentation and/or other materials provided with the distribution. | ||
// * Neither the name of NVIDIA CORPORATION nor the names of its | ||
// contributors may be used to endorse or promote products derived | ||
// from this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY | ||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | ||
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
#include "pb_bls_cancel.h" | ||
|
||
#include "pb_stub.h" | ||
|
||
namespace triton { namespace backend { namespace python { | ||
|
||
void | ||
PbBLSCancel::SaveToSharedMemory(std::unique_ptr<SharedMemoryManager>& shm_pool) | ||
{ | ||
cancel_shm_ = shm_pool->Construct<CancelBLSRequestMessage>(); | ||
new (&(cancel_shm_.data_->mu)) bi::interprocess_mutex; | ||
new (&(cancel_shm_.data_->cv)) bi::interprocess_condition; | ||
cancel_shm_.data_->waiting_on_stub = false; | ||
cancel_shm_.data_->infer_payload_id = infer_playload_id_; | ||
cancel_shm_.data_->is_cancelled = is_cancelled_; | ||
} | ||
|
||
bi::managed_external_buffer::handle_t | ||
PbBLSCancel::ShmHandle() | ||
{ | ||
return cancel_shm_.handle_; | ||
} | ||
|
||
CancelBLSRequestMessage* | ||
PbBLSCancel::ShmPayload() | ||
{ | ||
return cancel_shm_.data_.get(); | ||
} | ||
|
||
void | ||
PbBLSCancel::Cancel() | ||
{ | ||
// Release the GIL. Python objects are not accessed during the check. | ||
py::gil_scoped_release gil_release; | ||
|
||
std::unique_lock<std::mutex> lk(mu_); | ||
// The cancelled flag can only move from false to true, not the other way, so | ||
// it is checked on each query until cancelled and then implicitly cached. | ||
if (is_cancelled_) { | ||
return; | ||
} | ||
if (!updating_) { | ||
std::unique_ptr<Stub>& stub = Stub::GetOrCreateInstance(); | ||
if (!stub->StubToParentServiceActive()) { | ||
LOG_ERROR << "Cannot communicate with parent service"; | ||
return; | ||
} | ||
|
||
stub->EnqueueCancelBLSRequest(this); | ||
updating_ = true; | ||
} | ||
cv_.wait(lk, [this] { return !updating_; }); | ||
} | ||
|
||
void | ||
PbBLSCancel::ReportIsCancelled(bool is_cancelled) | ||
{ | ||
{ | ||
std::lock_guard<std::mutex> lk(mu_); | ||
is_cancelled_ = is_cancelled; | ||
updating_ = false; | ||
} | ||
cv_.notify_all(); | ||
} | ||
|
||
}}} // namespace triton::backend::python |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
// Copyright 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 | ||
// are met: | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above copyright | ||
// notice, this list of conditions and the following disclaimer in the | ||
// documentation and/or other materials provided with the distribution. | ||
// * Neither the name of NVIDIA CORPORATION nor the names of its | ||
// contributors may be used to endorse or promote products derived | ||
// from this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY | ||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | ||
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
#pragma once | ||
|
||
#include <condition_variable> | ||
#include <mutex> | ||
|
||
#include "pb_utils.h" | ||
|
||
namespace triton { namespace backend { namespace python { | ||
|
||
class PbBLSCancel { | ||
public: | ||
PbBLSCancel(void* infer_playload_id) | ||
: updating_(false), infer_playload_id_(infer_playload_id), | ||
is_cancelled_(false) | ||
{ | ||
} | ||
DISALLOW_COPY_AND_ASSIGN(PbBLSCancel); | ||
|
||
void SaveToSharedMemory(std::unique_ptr<SharedMemoryManager>& shm_pool); | ||
bi::managed_external_buffer::handle_t ShmHandle(); | ||
CancelBLSRequestMessage* ShmPayload(); | ||
|
||
void Cancel(); | ||
void ReportIsCancelled(bool is_cancelled); | ||
|
||
private: | ||
AllocatedSharedMemory<CancelBLSRequestMessage> cancel_shm_; | ||
|
||
std::mutex mu_; | ||
std::condition_variable cv_; | ||
bool updating_; | ||
|
||
void* infer_playload_id_; | ||
bool is_cancelled_; | ||
}; | ||
|
||
}}}; // namespace triton::backend::python |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.