Skip to content

fix(weights): include bounded writers in readiness checks #190

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

Open
Afloat16 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Open

fix(weights): include bounded writers in readiness checks #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions edge0-infer/src/weights/runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,11 @@ exec::Status Weights::promote(const std::shared_ptr<Write>& write) {
bool Weights::ready(const std::shared_ptr<Write>& write) const {
if(!write) return true;
std::lock_guard<std::mutex> operation(write->operation_);
return std::all_of(write->futures_.begin(),write->futures_.end(),[](const auto& f) {
return !f.valid() || f.wait_for(std::chrono::seconds(0))==std::future_status::ready;
});
const auto ready=[](const auto& future) {
return !future.valid() || future.wait_for(std::chrono::seconds(0))==std::future_status::ready;
};
return std::all_of(write->futures_.begin(),write->futures_.end(),ready) &&
std::all_of(write->writers_.begin(),write->writers_.end(),ready);
}
Result<std::vector<Binding>> Weights::complete(const std::shared_ptr<Write>& write) {
if(auto error=promote(write)) return *error;
Expand Down
3 changes: 3 additions & 0 deletions edge0-infer/tests/unit/weights/lifecycle_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ int main(int argc,char** argv) {
auto first=take(w.writable_regions(tx,0,0,8));
CHECK(!w.writable_regions(tx,0,4,8)); CHECK(!w.writable_regions(tx,0,16,1));
auto last=take(w.writable_regions(tx,0,8,8));
CHECK(!w.ready(tx));
CHECK(first->write(7,data,2)); CHECK(!first->write(0,data,8));
CHECK(!first->finish(Error{ErrorCategory::backend_error,"injected"}));
CHECK(!w.ready(tx));
auto completion=std::async(std::launch::async,[&] { return w.complete(tx); });
CHECK(completion.wait_for(20ms)==std::future_status::timeout);
CHECK(!last->write(0,data+2,8)); CHECK(!last->finish()); CHECK(!completion.get());
Expand All @@ -72,6 +74,7 @@ int main(int argc,char** argv) {
auto target=take(w.create_storage(backend,{{{GGML_TYPE_F32,{4}},1}}, edge0::exec::Purpose::resident_weights));
tx=take(w.begin_write(target,{item(0,"custom")}));
auto writer=take(w.writable_regions(tx,0,0,16)); CHECK(!writer->write(0,data,16)); CHECK(!writer->finish());
CHECK(w.ready(tx));
auto binding=take(w.complete(tx)); CHECK(binding[0].generation==1);
view=take(w.acquire_views(target,binding[0]));
auto closing=std::async(std::launch::async,[&] { return w.close(target); });
Expand Down