ggml-qnn: rebase to upstream

Author: zhouwg

common/console.cpp

@@ -241,9 +241,7 @@ namespace console {
         (void)codepoint;
         return 1;
 #else
-        //return wcwidth(codepoint);
-        (void)codepoint;
-        return 1;
+        return wcwidth(codepoint);
 #endif
     }
 

examples/export-lora/export-lora.cpp

@@ -148,7 +148,7 @@ struct lora_merge_ctx {
 
         ctx_out = gguf_init_empty();
         struct ggml_init_params params = {
-            /*.mem_size   =*/ static_cast<size_t>(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()),
+            /*.mem_size   =*/ gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead(),
             /*.mem_buffer =*/ NULL,
             /*.no_alloc   =*/ true,
         };