Merge branch 'master' into gg/flash-attn
This commit is contained in:
commit
6875997fd6
84 changed files with 7764 additions and 14303 deletions
|
@ -703,6 +703,7 @@ static bool ggml_metal_graph_compute(
|
|||
struct ggml_metal_context * ctx,
|
||||
struct ggml_cgraph * gf) {
|
||||
|
||||
@autoreleasepool {
|
||||
MTLComputePassDescriptor * edesc = MTLComputePassDescriptor.computePassDescriptor;
|
||||
edesc.dispatchType = MTLDispatchTypeSerial;
|
||||
|
||||
|
@ -2395,6 +2396,7 @@ static bool ggml_metal_graph_compute(
|
|||
[[MTLCaptureManager sharedCaptureManager] stopCapture];
|
||||
}
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue