Commit Graph

137 Commits

Author SHA1 Message Date
0cc4m ebc5d0651a Use events instead of clFinish, where possible 2023-05-27 10:03:35 +02:00
Concedo 6d7749c98f no difference 2023-05-27 12:42:19 +08:00
Concedo bd4fe936f5 cleanup sampling code 2023-05-27 11:58:39 +08:00
Concedo c97e10c50c Merge branch 'master' into concedo_experimental 2023-05-24 00:36:30 +08:00
Maarten ter Huurne 7d873811f3 Fix handling of "invalid property" when creating OpenCL command queue (#1565)
The `clCreateCommandQueue()` function will return the code
`CL_INVALID_QUEUE_PROPERTIES` when passed unsupported properties,
not `CL_INVALID_PROPERTY` as the original code was checking for.
2023-05-23 19:01:15 +03:00
Concedo 5bf9784381 Merge branch 'master' into concedo_experimental
# Conflicts:
#	CMakeLists.txt
#	Makefile
#	ggml-opencl.cpp
#	llama.cpp
2023-05-23 18:19:16 +08:00
0cc4m 2e6cd4b025 OpenCL Token Generation Acceleration (#1459)
* Move back to C++ for OpenCL

* Refactor OpenCL code to work more like the CUDA code, add missing functions

* Deduplicate dequant kernels

* Add OpenCL compile options

* Use compile args for preprocessing constants

* Restore default platform + device selection by id behavior

---------

Co-authored-by: Johannes Gäßler <johannesg@5d6.de>
Co-authored-by: Henri Vasserman <henv@hot.ee>
2023-05-23 00:33:24 +03:00
Concedo 981d5ba866 Merge remote-tracking branch 'occam/opencl-dev' into concedo_experimental
# Conflicts:
#	.github/workflows/build.yml
#	CMakeLists.txt
#	Makefile
#	README.md
#	ggml-opencl.cpp
#	llama.cpp
#	otherarch/ggml_v2-opencl-legacy.c
2023-05-22 16:16:48 +08:00
Concedo 587308a202 fixed some build errors on linux, changed icon resolution, added more error printing 2023-05-22 12:18:42 +08:00
0cc4m 18e9dd87da Explicitely set GEMM type 2023-05-21 08:34:17 +02:00
0cc4m b6b39960c0 Use compile args for preprocessing constants 2023-05-21 08:17:17 +02:00
0cc4m a1657d0233 Add OpenCL compile options 2023-05-21 07:53:22 +02:00
0cc4m e41a7ae40c Fix convert_row_f16 kernel issue 2023-05-21 07:53:22 +02:00
0cc4m 457eff920e Deduplicate dequant kernels 2023-05-21 07:53:22 +02:00
0cc4m 42e1a2ba3d Fix tensor load to device
Co-authored-by: Johannes Gäßler <johannesg@5d6.de>
2023-05-21 07:50:27 +02:00
0cc4m cda2d488f9 Fix error in convert f16 to f32 kernel call 2023-05-21 07:49:54 +02:00
0cc4m 915d0d1168 Generate dequant_mul_mat kernels from simple templates 2023-05-21 07:49:24 +02:00
0cc4m cb588e2aa4 Add remaining dequant_mul_mat functions 2023-05-21 07:47:18 +02:00
0cc4m 8c7a7cea2e Fix dequant_mul_mat kernel 2023-05-21 07:44:49 +02:00
0cc4m 5f610c90bf Fix bugs in dequant_mul_mat code 2023-05-21 07:44:48 +02:00
0cc4m 17e53dbb7e Refactor OpenCL code to work more like the CUDA code, add missing functions 2023-05-21 07:42:06 +02:00
0cc4m a7e3bee4cc Move back to C++ for OpenCL 2023-05-21 06:17:31 +02:00
Concedo c048bcfec4 remove old filever checks (+7 squashed commit)
Squashed commit:

[b72627a] new format not working

[e568870] old ver works

[7053b77] compile errors fixed, fixing linkers

[4ae8889] add new ver

[ff82dfd] file format checks

[25b8aa8] refactoring type names

[931063b] still merging
2023-05-21 00:15:39 +08:00
0cc4m 02914698f0 Update Q4_0, Q4_1 and Q8_0 to use half instead of float 2023-05-20 07:45:56 +02:00
0cc4m 285f8f990b Explicitely set CLBlast GEMM type 2023-05-20 07:26:38 +02:00
0cc4m 78b1d8351f Add OpenCL compile options 2023-05-19 21:18:57 +02:00
0cc4m b73c437e83 Fix convert_row_f16 kernel issue 2023-05-18 08:05:19 +02:00
0cc4m 0df55da4ca Deduplicate dequant kernels 2023-05-18 07:35:40 +02:00
0cc4m 67dbd356b6 Remove redundant constant values 2023-05-17 19:20:46 +02:00
0cc4m de10afa80f Fix tensor load to device
Co-authored-by: Johannes Gäßler <johannesg@5d6.de>
2023-05-16 18:49:49 +02:00
0cc4m b3ff66d87f Fix error in convert f16 to f32 kernel call 2023-05-16 13:05:33 +02:00
0cc4m 342d346c13 Generate dequant_mul_mat kernels from simple templates 2023-05-16 07:42:01 +02:00
0cc4m 5a74dc1536 Add remaining dequant_mul_mat functions 2023-05-14 22:19:54 +02:00
0cc4m 883e587a04 Fix dequant_mul_mat kernel 2023-05-14 21:26:28 +02:00
0cc4m 8795403de3 Fix bugs in dequant_mul_mat code 2023-05-14 21:14:05 +02:00
0cc4m c77966524a Refactor OpenCL code to work more like the CUDA code, add missing functions 2023-05-14 17:01:46 +02:00
0cc4m 82bc517b9a Move back to C++ for OpenCL 2023-05-14 17:00:37 +02:00