Skip to content

Commit

Permalink
Merge branch 'task/kab163/resource-aware-pool' of github.com:LLNL/Ump…
Browse files Browse the repository at this point in the history
…ire into task/kab163/resource-aware-pool
  • Loading branch information
kab163 committed Oct 11, 2024
2 parents 09cb0cb + f0cc90e commit 7c33d96
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions examples/rap_example.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <stdio.h>

#include <iostream>

#include "camp/camp.hpp"
Expand Down
3 changes: 2 additions & 1 deletion src/umpire/strategy/ResourceAwarePool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ void ResourceAwarePool::deallocate_resource(camp::resources::Resource r, void* p

auto my_r = getResource(ptr);
if (my_r != r) {
UMPIRE_ERROR(runtime_error,
UMPIRE_ERROR(
runtime_error,
fmt::format("Called deallocate with different resource than what is returned by getResource. Called with {},",
"but getResource returned: {}", camp::resources::to_string(r), camp::resources::to_string(my_r)));
}
Expand Down

0 comments on commit 7c33d96

Please sign in to comment.