mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-09-18 16:55:14 +02:00
Merge remote-tracking branch 'origin/upstream' into concedo_experimental
# Conflicts: # examples/save-load-state/save-load-state.cpp # ggml/CMakeLists.txt # ggml/src/ggml-cpu/CMakeLists.txt # ggml/src/ggml-hexagon/htp/hmx-matmul-ops.c # ggml/src/ggml-hexagon/htp/matmul-ops.c # ggml/src/ggml-opencl/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-opencl/kernels/gemm_noshuffle_q4_0_f32.cl # ggml/src/ggml-opencl/kernels/gemm_noshuffle_q8_0_f32.cl # ggml/src/ggml-opencl/kernels/gemv_noshuffle_q4_0_f32.cl # ggml/src/ggml-opencl/kernels/gemv_noshuffle_q4_0_f32_spec.cl # ggml/src/ggml-opencl/kernels/gemv_noshuffle_q8_0_f32.cl # ggml/src/ggml-rpc/ggml-rpc.cpp # scripts/sync-ggml.last # scripts/sync_vendor.py # src/llama-graph.cpp # tests/test-backend-ops.cpp # tests/test-state-restore-fragmented.cpp
This commit is contained in:
+6
-1
@@ -65,8 +65,13 @@ static bool can_reuse_kq_mask(
|
||||
|
||||
// ggml_tensor * res;
|
||||
|
||||
// res = ggml_reshape_2d(ctx, cur, n, ggml_nelements(cur)/n);
|
||||
// if (!ggml_is_contiguous(cur)) {
|
||||
// res = ggml_cont_2d (ctx, cur, n, ggml_nelements(cur)/n);
|
||||
// } else {
|
||||
// res = ggml_reshape_2d(ctx, cur, n, ggml_nelements(cur)/n);
|
||||
// }
|
||||
// res = ggml_mul_mat (ctx, rot, res);
|
||||
// ggml_mul_mat_set_hint(res, GGML_HINT_SRC0_IS_HADAMARD);
|
||||
// res = ggml_reshape_4d(ctx, res, cur->ne[0], cur->ne[1], cur->ne[2], cur->ne[3]);
|
||||
|
||||
// return res;
|
||||
|
||||
Reference in New Issue
Block a user