vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring: add convient macro to disable copy and move of class

Browse source
This commit is contained in:
hongruichen 2024-07-29 22:18:48 +08:00
parent 6da82947df
commit 9a5f802bb6
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ggml/src/ggml-qnn/graph.hpp
View file

@ -225,10 +225,8 @@ private:
std::vector<Qnn_Tensor_t> _qnn_tensor_outputs; std::vector<Qnn_Tensor_t> _qnn_tensor_outputs;
std::vector<Qnn_Param_t> _param_types; std::vector<Qnn_Param_t> _param_types;
ggml_qnn_graph(const ggml_qnn_graph &) = delete; DISABLE_COPY(ggml_qnn_graph);
void operator=(const ggml_qnn_graph &) = delete; DISABLE_MOVE(ggml_qnn_graph);
ggml_qnn_graph(ggml_qnn_graph &&) = delete;
void operator=(ggml_qnn_graph &&) = delete;
}; };
} // namespace qnn } // namespace qnn

8
ggml/src/ggml-qnn/qnn-types.hpp
View file

@ -51,3 +51,11 @@ using pfn_qnnsysteminterface_getproviders = decltype(QnnSystemInterface_getProvi
#define RPCMEM_DEFAULT_FLAGS 1 #define RPCMEM_DEFAULT_FLAGS 1
#define RPCMEM_HEAP_ID_SYSTEM 25 #define RPCMEM_HEAP_ID_SYSTEM 25
#define DISABLE_COPY(class_name) \
class_name(const class_name &) = delete; \
void operator=(const class_name &) = delete
#define DISABLE_MOVE(class_name) \
class_name(class_name &&) = delete; \
void operator=(class_name &&) = delete

6
ggml/src/ggml-qnn/tensor.hpp
View file

@ -193,10 +193,8 @@ private:
Qnn_GraphHandle_t _graph_handle = nullptr; Qnn_GraphHandle_t _graph_handle = nullptr;
std::unique_ptr<ggml_qnn_rpc_buffer> _qnn_rpc_buffer; std::unique_ptr<ggml_qnn_rpc_buffer> _qnn_rpc_buffer;
ggml_qnn_tensor(const ggml_qnn_tensor &) = delete; DISABLE_COPY(ggml_qnn_tensor);
void operator=(const ggml_qnn_tensor &) = delete; DISABLE_MOVE(ggml_qnn_tensor);
ggml_qnn_tensor(ggml_qnn_tensor &&) = delete;
void operator=(ggml_qnn_tensor &&) = delete;
}; };
} // namespace qnn } // namespace qnn