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

fix: back to qnn tensor v1 to fix the create tensor error

Browse source
This commit is contained in:
hongruichen 2024-07-22 21:34:33 +08:00
parent 3b47056c97
commit 706793f078
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@
#include "QnnTypes.h" #include "QnnTypes.h"
#include "logger.hpp" #include "logger.hpp"
#define QNN_TENSOR_VER(x) ((x).v2) #define QNN_TENSOR_VER(x) ((x).v1)
namespace qnn { namespace qnn {
@ -31,7 +31,7 @@ const char *opname_from_ggmlop(enum ggml_op ggmlop);
const char *get_qnn_error_string(Qnn_ErrorHandle_t error); const char *get_qnn_error_string(Qnn_ErrorHandle_t error);
constexpr const Qnn_TensorVersion_t kDefaultQnnTensorVersion = QNN_TENSOR_VERSION_2; constexpr const Qnn_TensorVersion_t kDefaultQnnTensorVersion = QNN_TENSOR_VERSION_1;
inline Qnn_Tensor_t qnn_tensor_init(Qnn_TensorVersion_t version) { inline Qnn_Tensor_t qnn_tensor_init(Qnn_TensorVersion_t version) {
Qnn_Tensor_t tensor; Qnn_Tensor_t tensor;
@ -182,8 +182,8 @@ inline void set_qnn_tensor_memhandle(Qnn_Tensor_t &tensor, Qnn_MemHandle_t handl
} }
inline void set_qnn_tensor_dyn_dimensions(Qnn_Tensor_t &tensor, uint8_t *isDynamicDimensions) { inline void set_qnn_tensor_dyn_dimensions(Qnn_Tensor_t &tensor, uint8_t *isDynamicDimensions) {
if (tensor.version == kDefaultQnnTensorVersion) { if (tensor.version == QNN_TENSOR_VERSION_2) {
QNN_TENSOR_VER(tensor).isDynamicDimensions = isDynamicDimensions; tensor.v2.isDynamicDimensions = isDynamicDimensions;
} }
} }