AN Long commited on
Commit
685748d
·
1 Parent(s): 0ab9aba

ggml : fix field name when new ggml_backend (llama/14944)

Browse files
ggml/src/ggml-blas/ggml-blas.cpp CHANGED
@@ -281,10 +281,10 @@ ggml_backend_t ggml_backend_blas_init(void) {
281
  ggml_backend_blas_context * ctx = new ggml_backend_blas_context;
282
 
283
  ggml_backend_t backend = new ggml_backend {
284
- /* .guid = */ ggml_backend_blas_guid(),
285
- /* .interface = */ blas_backend_i,
286
- /* .device = */ ggml_backend_reg_dev_get(ggml_backend_blas_reg(), 0),
287
- /* .context = */ ctx,
288
  };
289
 
290
  #if defined(OPENBLAS_VERSION) && defined(GGML_USE_OPENMP)
 
281
  ggml_backend_blas_context * ctx = new ggml_backend_blas_context;
282
 
283
  ggml_backend_t backend = new ggml_backend {
284
+ /* .guid = */ ggml_backend_blas_guid(),
285
+ /* .iface = */ blas_backend_i,
286
+ /* .device = */ ggml_backend_reg_dev_get(ggml_backend_blas_reg(), 0),
287
+ /* .context = */ ctx,
288
  };
289
 
290
  #if defined(OPENBLAS_VERSION) && defined(GGML_USE_OPENMP)
ggml/src/ggml-cpu/ggml-cpu.cpp CHANGED
@@ -214,10 +214,10 @@ ggml_backend_t ggml_backend_cpu_init(void) {
214
  ctx->abort_callback_data = NULL;
215
 
216
  ggml_backend_t cpu_backend = new ggml_backend {
217
- /* .guid = */ ggml_backend_cpu_guid(),
218
- /* .interface = */ ggml_backend_cpu_i,
219
- /* .device = */ ggml_backend_reg_dev_get(ggml_backend_cpu_reg(), 0),
220
- /* .context = */ ctx,
221
  };
222
 
223
  if (cpu_backend == NULL) {
 
214
  ctx->abort_callback_data = NULL;
215
 
216
  ggml_backend_t cpu_backend = new ggml_backend {
217
+ /* .guid = */ ggml_backend_cpu_guid(),
218
+ /* .iface = */ ggml_backend_cpu_i,
219
+ /* .device = */ ggml_backend_reg_dev_get(ggml_backend_cpu_reg(), 0),
220
+ /* .context = */ ctx,
221
  };
222
 
223
  if (cpu_backend == NULL) {
ggml/src/ggml-cuda/ggml-cuda.cu CHANGED
@@ -3799,10 +3799,10 @@ ggml_backend_t ggml_backend_cuda_init(int device) {
3799
  }
3800
 
3801
  ggml_backend_t cuda_backend = new ggml_backend {
3802
- /* .guid = */ ggml_backend_cuda_guid(),
3803
- /* .interface = */ ggml_backend_cuda_interface,
3804
- /* .device = */ ggml_backend_reg_dev_get(ggml_backend_cuda_reg(), device),
3805
- /* .context = */ ctx,
3806
  };
3807
 
3808
  return cuda_backend;
 
3799
  }
3800
 
3801
  ggml_backend_t cuda_backend = new ggml_backend {
3802
+ /* .guid = */ ggml_backend_cuda_guid(),
3803
+ /* .iface = */ ggml_backend_cuda_interface,
3804
+ /* .device = */ ggml_backend_reg_dev_get(ggml_backend_cuda_reg(), device),
3805
+ /* .context = */ ctx,
3806
  };
3807
 
3808
  return cuda_backend;
ggml/src/ggml-opencl/ggml-opencl.cpp CHANGED
@@ -2624,10 +2624,10 @@ ggml_backend_t ggml_backend_opencl_init(void) {
2624
  ggml_backend_opencl_context *backend_ctx = ggml_cl2_init(dev);
2625
 
2626
  ggml_backend_t backend = new ggml_backend {
2627
- /* .guid = */ ggml_backend_opencl_guid(),
2628
- /* .interface = */ ggml_backend_opencl_i,
2629
- /* .device = */ dev,
2630
- /* .context = */ backend_ctx
2631
  };
2632
 
2633
  return backend;
 
2624
  ggml_backend_opencl_context *backend_ctx = ggml_cl2_init(dev);
2625
 
2626
  ggml_backend_t backend = new ggml_backend {
2627
+ /* .guid = */ ggml_backend_opencl_guid(),
2628
+ /* .iface = */ ggml_backend_opencl_i,
2629
+ /* .device = */ dev,
2630
+ /* .context = */ backend_ctx
2631
  };
2632
 
2633
  return backend;
ggml/src/ggml-rpc/ggml-rpc.cpp CHANGED
@@ -823,10 +823,10 @@ ggml_backend_t ggml_backend_rpc_init(const char * endpoint) {
823
  };
824
 
825
  ggml_backend_t backend = new ggml_backend {
826
- /* .guid = */ ggml_backend_rpc_guid(),
827
- /* .interface = */ ggml_backend_rpc_interface,
828
- /* .device = */ ggml_backend_rpc_add_device(endpoint),
829
- /* .context = */ ctx
830
  };
831
  return backend;
832
  }
 
823
  };
824
 
825
  ggml_backend_t backend = new ggml_backend {
826
+ /* .guid = */ ggml_backend_rpc_guid(),
827
+ /* .iface = */ ggml_backend_rpc_interface,
828
+ /* .device = */ ggml_backend_rpc_add_device(endpoint),
829
+ /* .context = */ ctx
830
  };
831
  return backend;
832
  }
ggml/src/ggml-sycl/ggml-sycl.cpp CHANGED
@@ -4586,10 +4586,10 @@ ggml_backend_t ggml_backend_sycl_init(int device) {
4586
  };
4587
 
4588
  ggml_backend_t sycl_backend = new ggml_backend {
4589
- /* .guid = */ ggml_backend_sycl_guid(),
4590
- /* .interface = */ ggml_backend_sycl_interface,
4591
- /* .device = */ ggml_backend_reg_dev_get(ggml_backend_sycl_reg(), device),
4592
- /* .context = */ ctx
4593
  };
4594
 
4595
  return sycl_backend;
 
4586
  };
4587
 
4588
  ggml_backend_t sycl_backend = new ggml_backend {
4589
+ /* .guid = */ ggml_backend_sycl_guid(),
4590
+ /* .iface = */ ggml_backend_sycl_interface,
4591
+ /* .device = */ ggml_backend_reg_dev_get(ggml_backend_sycl_reg(), device),
4592
+ /* .context = */ ctx
4593
  };
4594
 
4595
  return sycl_backend;
ggml/src/ggml-vulkan/ggml-vulkan.cpp CHANGED
@@ -10767,10 +10767,10 @@ ggml_backend_t ggml_backend_vk_init(size_t dev_num) {
10767
  ggml_vk_init(ctx, dev_num);
10768
 
10769
  ggml_backend_t vk_backend = new ggml_backend {
10770
- /* .guid = */ ggml_backend_vk_guid(),
10771
- /* .interface = */ ggml_backend_vk_interface,
10772
- /* .device = */ ggml_backend_reg_dev_get(ggml_backend_vk_reg(), dev_num),
10773
- /* .context = */ ctx,
10774
  };
10775
 
10776
  return vk_backend;
 
10767
  ggml_vk_init(ctx, dev_num);
10768
 
10769
  ggml_backend_t vk_backend = new ggml_backend {
10770
+ /* .guid = */ ggml_backend_vk_guid(),
10771
+ /* .iface = */ ggml_backend_vk_interface,
10772
+ /* .device = */ ggml_backend_reg_dev_get(ggml_backend_vk_reg(), dev_num),
10773
+ /* .context = */ ctx,
10774
  };
10775
 
10776
  return vk_backend;