Skip to content

Commit 9878eb8

Browse files
author
haowhsu
committed
replace custom deleter with func ptr
1 parent c80c123 commit 9878eb8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

examples/qualcomm/llama2/qaihub_runner/io_memory.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ namespace executor {
1717
Memory::Memory(
1818
const std::vector<std::string>& pos_embs_path,
1919
std::vector<std::shared_ptr<Module>>& modules)
20-
: input_tensors_(4),
20+
: data_ptr_(nullptr, [](void*) {}),
21+
input_tensors_(4),
2122
output_tensors_(4),
2223
pos_embs_path_(pos_embs_path),
2324
modules_(modules) {}
@@ -50,7 +51,7 @@ BertMemory::BertMemory(
5051
const std::vector<std::string>& pos_embs_path,
5152
std::vector<std::shared_ptr<Module>>& modules)
5253
: Memory(pos_embs_path, modules) {
53-
data_ptr_ = std::unique_ptr<void, std::function<void(void*)>>(
54+
data_ptr_ = std::unique_ptr<void, void (*)(void*)>(
5455
new IO, [](void* ptr) { delete static_cast<IO*>(ptr); });
5556
}
5657

@@ -204,7 +205,7 @@ KVCachedMemory::KVCachedMemory(
204205
const std::vector<std::string>& pos_embs_path,
205206
std::vector<std::shared_ptr<Module>>& modules)
206207
: Memory(pos_embs_path, modules) {
207-
data_ptr_ = std::unique_ptr<void, std::function<void(void*)>>(
208+
data_ptr_ = std::unique_ptr<void, void (*)(void*)>(
208209
new IO, [](void* ptr) { delete static_cast<IO*>(ptr); });
209210
futures_ = std::vector<std::future<void>>(thread_pool_.num_workers());
210211
}

examples/qualcomm/llama2/qaihub_runner/io_memory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Memory {
3838
std::vector<Tensor> get_output_tensors(int shard_index);
3939

4040
protected:
41-
std::unique_ptr<void, std::function<void(void*)>> data_ptr_;
41+
std::unique_ptr<void, void (*)(void*)> data_ptr_;
4242
std::vector<std::vector<TensorImpl*>> input_tensors_;
4343
std::vector<std::vector<TensorImpl*>> output_tensors_;
4444
std::vector<std::string> pos_embs_path_;

0 commit comments

Comments
 (0)