Skip to content

Commit c0b4509

Browse files
authored
rename optimize_graph to graph_optimize (#16082)
1 parent 38dbdf4 commit c0b4509

File tree

13 files changed

+22
-22
lines changed

13 files changed

+22
-22
lines changed

ggml/src/ggml-backend-impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ extern "C" {
116116
void (*event_wait) (ggml_backend_t backend, ggml_backend_event_t event);
117117

118118
// (optional) sort/optimize the nodes in the graph
119-
void (*optimize_graph) (ggml_backend_t backend, struct ggml_cgraph * cgraph);
119+
void (*graph_optimize) (ggml_backend_t backend, struct ggml_cgraph * cgraph);
120120
};
121121

122122
struct ggml_backend {

ggml/src/ggml-backend.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,10 @@ void ggml_backend_event_wait(ggml_backend_t backend, ggml_backend_event_t event)
463463
backend->iface.event_wait(backend, event);
464464
}
465465

466-
static void ggml_backend_optimize_graph(ggml_backend_t backend, struct ggml_cgraph * cgraph) {
466+
static void ggml_backend_graph_optimize(ggml_backend_t backend, struct ggml_cgraph * cgraph) {
467467
GGML_ASSERT(backend);
468-
if (backend->iface.optimize_graph != NULL) {
469-
backend->iface.optimize_graph(backend, cgraph);
468+
if (backend->iface.graph_optimize != NULL) {
469+
backend->iface.graph_optimize(backend, cgraph);
470470
}
471471
}
472472

@@ -1307,7 +1307,7 @@ void ggml_backend_sched_split_graph(ggml_backend_sched_t sched, struct ggml_cgra
13071307

13081308
// Optimize this split of the graph. This needs to happen before we make graph_copy,
13091309
// so they are in sync.
1310-
ggml_backend_optimize_graph(sched->backends[split->backend_id], &split->graph);
1310+
ggml_backend_graph_optimize(sched->backends[split->backend_id], &split->graph);
13111311

13121312
// add inputs to the graph copy so that they are allocated by ggml-alloc at the start of the split
13131313
for (int j = 0; j < split->n_inputs; j++) {

ggml/src/ggml-blas/ggml-blas.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ static struct ggml_backend_i blas_backend_i = {
270270
/* .graph_compute = */ ggml_backend_blas_graph_compute,
271271
/* .event_record = */ NULL,
272272
/* .event_wait = */ NULL,
273-
/* .optimize_graph = */ NULL,
273+
/* .graph_optimize = */ NULL,
274274
};
275275

276276
static ggml_guid_t ggml_backend_blas_guid(void) {

ggml/src/ggml-cann/ggml-cann.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2756,7 +2756,7 @@ static const ggml_backend_i ggml_backend_cann_interface = {
27562756
/* .graph_compute = */ ggml_backend_cann_graph_compute,
27572757
/* .event_record = */ ggml_backend_cann_event_record,
27582758
/* .event_wait = */ ggml_backend_cann_event_wait,
2759-
/* .optimize_graph = */ NULL,
2759+
/* .graph_optimize = */ NULL,
27602760
};
27612761

27622762
/**

ggml/src/ggml-cpu/ggml-cpu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static const struct ggml_backend_i ggml_backend_cpu_i = {
190190
/* .graph_compute = */ ggml_backend_cpu_graph_compute,
191191
/* .event_record = */ NULL,
192192
/* .event_wait = */ NULL,
193-
/* .optimize_graph = */ NULL,
193+
/* .graph_optimize = */ NULL,
194194
};
195195

196196
static ggml_guid_t ggml_backend_cpu_guid(void) {

ggml/src/ggml-cuda/ggml-cuda.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3140,7 +3140,7 @@ static const ggml_backend_i ggml_backend_cuda_interface = {
31403140
/* .graph_compute = */ ggml_backend_cuda_graph_compute,
31413141
/* .event_record = */ ggml_backend_cuda_event_record,
31423142
/* .event_wait = */ ggml_backend_cuda_event_wait,
3143-
/* .optimize_graph = */ NULL,
3143+
/* .graph_optimize = */ NULL,
31443144
};
31453145

31463146
static ggml_guid_t ggml_backend_cuda_guid() {

ggml/src/ggml-metal/ggml-metal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ static ggml_backend_i ggml_backend_metal_i = {
447447
// https://developer.apple.com/documentation/metal/mtlcommandbuffer#Synchronizing-Passes-with-Events
448448
/* .event_record = */ NULL,
449449
/* .event_wait = */ NULL,
450-
/* .optimize_graph = */ ggml_backend_metal_graph_optimize,
450+
/* .graph_optimize = */ ggml_backend_metal_graph_optimize,
451451
};
452452

453453
static ggml_guid_t ggml_backend_metal_guid(void) {

ggml/src/ggml-opencl/ggml-opencl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2838,7 +2838,7 @@ static ggml_backend_i ggml_backend_opencl_i = {
28382838
/* .graph_compute = */ ggml_backend_opencl_graph_compute,
28392839
/* .event_record = */ NULL,
28402840
/* .event_wait = */ NULL,
2841-
/* .optimize_graph = */ NULL,
2841+
/* .graph_optimize = */ NULL,
28422842
};
28432843

28442844
ggml_backend_t ggml_backend_opencl_init(void) {

ggml/src/ggml-rpc/ggml-rpc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ static ggml_backend_i ggml_backend_rpc_interface = {
795795
/* .graph_compute = */ ggml_backend_rpc_graph_compute,
796796
/* .event_record = */ NULL,
797797
/* .event_wait = */ NULL,
798-
/* .optimize_graph = */ NULL,
798+
/* .graph_optimize = */ NULL,
799799
};
800800

801801
ggml_backend_buffer_type_t ggml_backend_rpc_buffer_type(const char * endpoint) {

ggml/src/ggml-sycl/ggml-sycl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4073,7 +4073,7 @@ static ggml_backend_i ggml_backend_sycl_interface = {
40734073
/* .graph_compute = */ ggml_backend_sycl_graph_compute,
40744074
/* .event_record = */ ggml_backend_sycl_event_record,
40754075
/* .event_wait = */ ggml_backend_sycl_event_wait,
4076-
/* .optimize_graph = */ NULL,
4076+
/* .graph_optimize = */ NULL,
40774077
};
40784078

40794079
static ggml_guid_t ggml_backend_sycl_guid() {

0 commit comments

Comments
 (0)