Skip to content

Commit cf62118

Browse files
lhezlhez
committed
opencl: rename kernel files ggml-opencl2 -> ggml-opencl 
1 parent 8aff1c3 commit cf62118

11 files changed

+90
-83
lines changed

‎ggml/src/ggml-opencl/CMakeLists.txt‎

Lines changed: 72 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ if (OpenCL_FOUND)
2727
if (GGML_OPENCL_EMBED_KERNELS)
2828
add_compile_definitions(GGML_OPENCL_EMBED_KERNELS)
2929

30-
set(OPENCL2_CL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2.cl.h")
31-
set(OPENCL2_MM_CL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_mm.cl.h")
32-
set(OPENCL2_CVT_CL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_cvt.cl.h")
30+
set(OPENCL_CL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl.cl.h")
31+
set(OPENCL_MM_CL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_mm.cl.h")
32+
set(OPENCL_CVT_CL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_cvt.cl.h")
3333

34-
set(OPENCL2_GEMV_NOSHUFFLE_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_gemv_noshuffle.cl.h")
35-
set(OPENCL2_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_gemv_noshuffle_general.cl.h")
36-
set(OPENCL2_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_mul_mat_Ab_Bi_8x4.cl.h")
37-
set(OPENCL2_TRANSPOSE_16_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_transpose_16.cl.h")
38-
set(OPENCL2_TRANSPOSE_32_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_transpose_32.cl.h")
39-
set(OPENCL2_TRANSPOSE_32_16_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl2_transpose_32_16.cl.h")
34+
set(OPENCL_GEMV_NOSHUFFLE_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_gemv_noshuffle.cl.h")
35+
set(OPENCL_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_gemv_noshuffle_general.cl.h")
36+
set(OPENCL_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_mul_mat_Ab_Bi_8x4.cl.h")
37+
set(OPENCL_TRANSPOSE_16_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_transpose_16.cl.h")
38+
set(OPENCL_TRANSPOSE_32_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_transpose_32.cl.h")
39+
set(OPENCL_TRANSPOSE_32_16_SOURCE_EMBED "${CMAKE_BINARY_DIR}/autogenerated/ggml-opencl_transpose_32_16.cl.h")
4040

4141
set(EMBED_KERNEL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/kernels/embed_kernel.py")
4242
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/autogenerated")
@@ -45,101 +45,108 @@ if (OpenCL_FOUND)
4545

4646
# Python must be accessible from command line
4747
add_custom_command(
48-
OUTPUT ${OPENCL2_CL_SOURCE_EMBED}
48+
OUTPUT ${OPENCL_CL_SOURCE_EMBED}
4949
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
50-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2.cl
51-
${OPENCL2_CL_SOURCE_EMBED}
52-
DEPENDS kernels/ggml-opencl2.cl ${EMBED_KERNEL_SCRIPT}
50+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl.cl
51+
${OPENCL_CL_SOURCE_EMBED}
52+
DEPENDS kernels/ggml-opencl.cl ${EMBED_KERNEL_SCRIPT}
5353
COMMENT "Generate ggml-opencl2.cl.h"
5454
)
5555

5656
add_custom_command(
57-
OUTPUT ${OPENCL2_MM_CL_SOURCE_EMBED}
57+
OUTPUT ${OPENCL_MM_CL_SOURCE_EMBED}
5858
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
59-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_mm.cl
60-
${OPENCL2_MM_CL_SOURCE_EMBED}
61-
DEPENDS kernels/ggml-opencl2_mm.cl ${EMBED_KERNEL_SCRIPT}
62-
COMMENT "Generate ggml-opencl2_mm.cl.h"
59+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_mm.cl
60+
${OPENCL_MM_CL_SOURCE_EMBED}
61+
DEPENDS kernels/ggml-opencl_mm.cl ${EMBED_KERNEL_SCRIPT}
62+
COMMENT "Generate ggml-opencl_mm.cl.h"
6363
)
6464

6565
add_custom_command(
66-
OUTPUT ${OPENCL2_CVT_CL_SOURCE_EMBED}
66+
OUTPUT ${OPENCL_CVT_CL_SOURCE_EMBED}
6767
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
68-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_cvt.cl
69-
${OPENCL2_CVT_CL_SOURCE_EMBED}
70-
DEPENDS kernels/ggml-opencl2_cvt.cl ${EMBED_KERNEL_SCRIPT}
71-
COMMENT "Generate ggml-opencl2_cvt.cl.h"
68+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_cvt.cl
69+
${OPENCL_CVT_CL_SOURCE_EMBED}
70+
DEPENDS kernels/ggml-opencl_cvt.cl ${EMBED_KERNEL_SCRIPT}
71+
COMMENT "Generate ggml-opencl_cvt.cl.h"
7272
)
7373

7474
add_custom_command(
75-
OUTPUT ${OPENCL2_GEMV_NOSHUFFLE_SOURCE_EMBED}
75+
OUTPUT ${OPENCL_GEMV_NOSHUFFLE_SOURCE_EMBED}
7676
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
77-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_gemv_noshuffle.cl
78-
${OPENCL2_GEMV_NOSHUFFLE_SOURCE_EMBED}
79-
DEPENDS kernels/ggml-opencl2_gemv_noshuffle.cl ${EMBED_KERNEL_SCRIPT}
80-
COMMENT "Generate ggml-opencl2_gemv_noshuffle.cl.h"
77+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_gemv_noshuffle.cl
78+
${OPENCL_GEMV_NOSHUFFLE_SOURCE_EMBED}
79+
DEPENDS kernels/ggml-opencl_gemv_noshuffle.cl ${EMBED_KERNEL_SCRIPT}
80+
COMMENT "Generate ggml-opencl_gemv_noshuffle.cl.h"
8181
)
8282

8383
add_custom_command(
84-
OUTPUT ${OPENCL2_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED}
84+
OUTPUT ${OPENCL_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED}
8585
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
86-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_gemv_noshuffle_general.cl
87-
${OPENCL2_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED}
88-
DEPENDS kernels/ggml-opencl2_gemv_noshuffle_general.cl ${EMBED_KERNEL_SCRIPT}
89-
COMMENT "Generate ggml-opencl2_gemv_noshuffle_general.cl.h"
86+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_gemv_noshuffle_general.cl
87+
${OPENCL_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED}
88+
DEPENDS kernels/ggml-opencl_gemv_noshuffle_general.cl ${EMBED_KERNEL_SCRIPT}
89+
COMMENT "Generate ggml-opencl_gemv_noshuffle_general.cl.h"
9090
)
9191

9292
add_custom_command(
93-
OUTPUT ${OPENCL2_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED}
93+
OUTPUT ${OPENCL_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED}
9494
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
95-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_mul_mat_Ab_Bi_8x4.cl
96-
${OPENCL2_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED}
97-
DEPENDS kernels/ggml-opencl2_mul_mat_Ab_Bi_8x4.cl ${EMBED_KERNEL_SCRIPT}
98-
COMMENT "Generate ggml-opencl2_mul_mat_Ab_Bi_8x4.cl.cl.h"
95+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_mul_mat_Ab_Bi_8x4.cl
96+
${OPENCL_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED}
97+
DEPENDS kernels/ggml-opencl_mul_mat_Ab_Bi_8x4.cl ${EMBED_KERNEL_SCRIPT}
98+
COMMENT "Generate ggml-opencl_mul_mat_Ab_Bi_8x4.cl.cl.h"
9999
)
100100

101101
add_custom_command(
102-
OUTPUT ${OPENCL2_TRANSPOSE_16_SOURCE_EMBED}
102+
OUTPUT ${OPENCL_TRANSPOSE_16_SOURCE_EMBED}
103103
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
104-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_transpose_16.cl
105-
${OPENCL2_TRANSPOSE_16_SOURCE_EMBED}
106-
DEPENDS kernels/ggml-opencl2_transpose_16.cl ${EMBED_KERNEL_SCRIPT}
107-
COMMENT "Generate ggml-opencl2_transpose_16.cl.h"
104+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_transpose_16.cl
105+
${OPENCL_TRANSPOSE_16_SOURCE_EMBED}
106+
DEPENDS kernels/ggml-opencl_transpose_16.cl ${EMBED_KERNEL_SCRIPT}
107+
COMMENT "Generate ggml-opencl_transpose_16.cl.h"
108108
)
109109

110110
add_custom_command(
111-
OUTPUT ${OPENCL2_TRANSPOSE_32_SOURCE_EMBED}
111+
OUTPUT ${OPENCL_TRANSPOSE_32_SOURCE_EMBED}
112112
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
113-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_transpose_32.cl
114-
${OPENCL2_TRANSPOSE_32_SOURCE_EMBED}
115-
DEPENDS kernels/ggml-opencl2_transpose_32.cl ${EMBED_KERNEL_SCRIPT}
116-
COMMENT "Generate ggml-opencl2_transpose_32.cl.h"
113+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_transpose_32.cl
114+
${OPENCL_TRANSPOSE_32_SOURCE_EMBED}
115+
DEPENDS kernels/ggml-opencl_transpose_32.cl ${EMBED_KERNEL_SCRIPT}
116+
COMMENT "Generate ggml-opencl_transpose_32.cl.h"
117117
)
118118

119119
add_custom_command(
120-
OUTPUT ${OPENCL2_TRANSPOSE_32_16_SOURCE_EMBED}
120+
OUTPUT ${OPENCL_TRANSPOSE_32_16_SOURCE_EMBED}
121121
COMMAND ${Python3_EXECUTABLE} ${EMBED_KERNEL_SCRIPT}
122-
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl2_transpose_32_16.cl
123-
${OPENCL2_TRANSPOSE_32_16_SOURCE_EMBED}
124-
DEPENDS kernels/ggml-opencl2_transpose_32_16.cl ${EMBED_KERNEL_SCRIPT}
125-
COMMENT "Generate ggml-opencl2_transpose_32_16.cl.h"
122+
${CMAKE_CURRENT_SOURCE_DIR}/kernels/ggml-opencl_transpose_32_16.cl
123+
${OPENCL_TRANSPOSE_32_16_SOURCE_EMBED}
124+
DEPENDS kernels/ggml-opencl_transpose_32_16.cl ${EMBED_KERNEL_SCRIPT}
125+
COMMENT "Generate ggml-opencl_transpose_32_16.cl.h"
126126
)
127127

128128
target_sources(${TARGET_NAME} PRIVATE
129-
${OPENCL2_CL_SOURCE_EMBED}
130-
${OPENCL2_MM_CL_SOURCE_EMBED}
131-
${OPENCL2_CVT_CL_SOURCE_EMBED}
132-
${OPENCL2_GEMV_NOSHUFFLE_SOURCE_EMBED}
133-
${OPENCL2_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED}
134-
${OPENCL2_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED}
135-
${OPENCL2_TRANSPOSE_16_SOURCE_EMBED}
136-
${OPENCL2_TRANSPOSE_32_SOURCE_EMBED}
137-
${OPENCL2_TRANSPOSE_32_16_SOURCE_EMBED})
129+
${OPENCL_CL_SOURCE_EMBED}
130+
${OPENCL_MM_CL_SOURCE_EMBED}
131+
${OPENCL_CVT_CL_SOURCE_EMBED}
132+
${OPENCL_GEMV_NOSHUFFLE_SOURCE_EMBED}
133+
${OPENCL_GEMV_NOSHUFFLE_GENERAL_SOURCE_EMBED}
134+
${OPENCL_MUL_MAT_Ab_Bi_8x4_SOURCE_EMBED}
135+
${OPENCL_TRANSPOSE_16_SOURCE_EMBED}
136+
${OPENCL_TRANSPOSE_32_SOURCE_EMBED}
137+
${OPENCL_TRANSPOSE_32_16_SOURCE_EMBED})
138138
else ()
139139
# copy ggml-opencl.cl to bin directory
140-
configure_file(kernels/ggml-opencl2.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl2.cl COPYONLY)
141-
configure_file(kernels/ggml-opencl2_mm.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl2_mm.cl COPYONLY)
142-
configure_file(kernels/ggml-opencl2_cvt.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl2_cvt.cl COPYONLY)
140+
configure_file(kernels/ggml-opencl.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl.cl COPYONLY)
141+
configure_file(kernels/ggml-opencl_mm.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_mm.cl COPYONLY)
142+
configure_file(kernels/ggml-opencl_cvt.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_cvt.cl COPYONLY)
143+
144+
configure_file(kernels/ggml-opencl_gemv_noshuffle.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_gemv_noshuffle.cl COPYONLY)
145+
configure_file(kernels/ggml-opencl_gemv_noshuffle_general.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_gemv_noshuffle_general.cl COPYONLY)
146+
configure_file(kernels/ggml-opencl_mul_mat_Ab_Bi_8x4.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_mul_mat_Ab_Bi_8x4.cl COPYONLY)
147+
configure_file(kernels/ggml-opencl_transpose_16.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_transpose_16.cl COPYONLY)
148+
configure_file(kernels/ggml-opencl_transpose_32.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_transpose_32.cl COPYONLY)
149+
configure_file(kernels/ggml-opencl_transpose_32_16.cl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ggml-opencl_transpose_32_16.cl COPYONLY)
143150
endif ()
144151
else ()
145152
message(WARNING "OpenCL not found")

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -539,10 +539,10 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
539539

540540
#ifdef GGML_OPENCL_EMBED_KERNELS
541541
const std::string kernel_src {
542-
#include "ggml-opencl2.cl.h"
542+
#include "ggml-opencl.cl.h"
543543
};
544544
#else
545-
const std::string kernel_src = read_file("ggml-opencl2.cl");
545+
const std::string kernel_src = read_file("ggml-opencl.cl");
546546
#endif
547547

548548
std::string compile_opts =
@@ -597,10 +597,10 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
597597
// Load additional mulmat kernels.
598598
#ifdef GGML_OPENCL_EMBED_KERNELS
599599
const std::string kernel_src_1 {
600-
#include "ggml-opencl2_mm.cl.h"
600+
#include "ggml-opencl_mm.cl.h"
601601
};
602602
#else
603-
const std::string kernel_src_1 = read_file("ggml-opencl2_mm.cl");
603+
const std::string kernel_src_1 = read_file("ggml-opencl_mm.cl");
604604
#endif
605605
backend_ctx->program_1 = build_program_from_source(context, device, kernel_src_1.c_str(), compile_opts);
606606

@@ -613,10 +613,10 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
613613
// Load additional data conversion kernels.
614614
#ifdef GGML_OPENCL_EMBED_KERNELS
615615
const std::string kernel_src_2 {
616-
#include "ggml-opencl2_cvt.cl.h"
616+
#include "ggml-opencl_cvt.cl.h"
617617
};
618618
#else
619-
const std::string kernel_src_2 = read_file("ggml-opencl2_cvt.cl");
619+
const std::string kernel_src_2 = read_file("ggml-opencl_cvt.cl");
620620
#endif
621621
backend_ctx->program_2 = build_program_from_source(context, device, kernel_src_2.c_str(), compile_opts);
622622

@@ -626,30 +626,30 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
626626
#ifdef GGML_OPENCL_USE_ADRENO_KERNELS
627627
#ifdef GGML_OPENCL_EMBED_KERNELS
628628
const std::string transpose_32_src {
629-
#include "ggml-opencl2_transpose_32.cl.h"
629+
#include "ggml-opencl_transpose_32.cl.h"
630630
};
631631
#else
632-
const std::string transpose_32_src = read_file("ggml-opencl2_transpose_32.cl");
632+
const std::string transpose_32_src = read_file("ggml-opencl_transpose_32.cl");
633633
#endif
634634
backend_ctx->program_transpose_32 = build_program_from_source(context, device, transpose_32_src.c_str(), compile_opts);
635635
CL_CHECK((backend_ctx->kernel_transpose_32 = clCreateKernel(backend_ctx->program_transpose_32, "kernel_transpose_32", &err), err));
636636

637637
#ifdef GGML_OPENCL_EMBED_KERNELS
638638
const std::string transpose_32_16_src {
639-
#include "ggml-opencl2_transpose_32_16.cl.h"
639+
#include "ggml-opencl_transpose_32_16.cl.h"
640640
};
641641
#else
642-
const std::string transpose_32_16_src = read_file("ggml-opencl2_transpose_32_16.cl");
642+
const std::string transpose_32_16_src = read_file("ggml-opencl_transpose_32_16.cl");
643643
#endif
644644
backend_ctx->program_transpose_32_16 = build_program_from_source(context, device, transpose_32_16_src.c_str(), compile_opts);
645645
CL_CHECK((backend_ctx->kernel_transpose_32_16 = clCreateKernel(backend_ctx->program_transpose_32_16, "kernel_transpose_32_16", &err), err));
646646

647647
#ifdef GGML_OPENCL_EMBED_KERNELS
648648
const std::string transpose_16_src {
649-
#include "ggml-opencl2_transpose_16.cl.h"
649+
#include "ggml-opencl_transpose_16.cl.h"
650650
};
651651
#else
652-
const std::string transpose_16_src = read_file("ggml-opencl2_transpose_16.cl");
652+
const std::string transpose_16_src = read_file("ggml-opencl_transpose_16.cl");
653653
#endif
654654
backend_ctx->program_transpose_16 = build_program_from_source(context, device, transpose_16_src.c_str(), compile_opts);
655655
CL_CHECK((backend_ctx->kernel_transpose_16 = clCreateKernel(backend_ctx->program_transpose_16, "kernel_transpose_16", &err), err));
@@ -664,10 +664,10 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
664664
}
665665
#ifdef GGML_OPENCL_EMBED_KERNELS
666666
const std::string kernel_src_CL_gemv_general {
667-
#include "ggml-opencl2_gemv_noshuffle_general.cl.h"
667+
#include "ggml-opencl_gemv_noshuffle_general.cl.h"
668668
};
669669
#else
670-
const std::string kernel_src_CL_gemv_general = read_file("ggml-opencl2_gemv_noshuffle_general.cl");
670+
const std::string kernel_src_CL_gemv_general = read_file("ggml-opencl_gemv_noshuffle_general.cl");
671671
#endif
672672

673673
backend_ctx->program_CL_gemv_general = build_program_from_source(
@@ -686,10 +686,10 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
686686
}
687687
#ifdef GGML_OPENCL_EMBED_KERNELS
688688
const std::string kernel_src_CL_gemv {
689-
#include "ggml-opencl2_gemv_noshuffle.cl.h"
689+
#include "ggml-opencl_gemv_noshuffle.cl.h"
690690
};
691691
#else
692-
const std::string kernel_src_CL_gemv = read_file("ggml-opencl2_gemv_noshuffle.cl");
692+
const std::string kernel_src_CL_gemv = read_file("ggml-opencl_gemv_noshuffle.cl");
693693
#endif
694694

695695
backend_ctx->program_CL_gemv_4096_1_4096 = build_program_from_source(
@@ -743,10 +743,10 @@ static ggml_backend_opencl2_context * ggml_cl2_init(ggml_backend_dev_t dev) {
743743
// Gemm
744744
#ifdef GGML_OPENCL_EMBED_KERNELS
745745
const std::string kernel_src_CL_gemm {
746-
#include "ggml-opencl2_mul_mat_Ab_Bi_8x4.cl.h"
746+
#include "ggml-opencl_mul_mat_Ab_Bi_8x4.cl.h"
747747
};
748748
#else
749-
const std::string kernel_src_CL_gemm = read_file("ggml-opencl2_mul_mat_Ab_Bi_8x4.cl");
749+
const std::string kernel_src_CL_gemm = read_file("ggml-opencl_mul_mat_Ab_Bi_8x4.cl");
750750
#endif
751751
backend_ctx->program_CL_gemm = build_program_from_source(context, device, kernel_src_CL_gemm.c_str(), compile_opts);
752752
CL_CHECK((backend_ctx->CL_mul_mat_Ab_Bi_8x4 = clCreateKernel(backend_ctx->program_CL_gemm, "kernel_mul_mat_Ab_Bi_8x4", &err), err));

‎ggml/src/ggml-opencl/kernels/ggml-opencl2.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_cvt.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_cvt.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_gemv_noshuffle.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_gemv_noshuffle.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_gemv_noshuffle_general.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_gemv_noshuffle_general.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_mm.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_mm.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_mul_mat_Ab_Bi_8x4.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_mul_mat_Ab_Bi_8x4.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_transpose_16.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_transpose_16.cl‎

File renamed without changes.

‎ggml/src/ggml-opencl/kernels/ggml-opencl2_transpose_32.cl‎ renamed to ‎ggml/src/ggml-opencl/kernels/ggml-opencl_transpose_32.cl‎

File renamed without changes.

0 commit comments

Comments
 (0)