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
This commit is contained in:
Concedo 2023-05-22 16:16:48 +08:00
commit 981d5ba866
14 changed files with 941 additions and 321 deletions

View file

@ -298,8 +298,8 @@ static cl_program build_program_from_source(cl_context ctx, cl_device_id dev, co
void ggml_v2_cl_init(void) {
cl_int err = 0;
char * GGML_V2_CLBLAST_PLATFORM = getenv("GGML_CLBLAST_PLATFORM");
char * GGML_V2_CLBLAST_DEVICE = getenv("GGML_CLBLAST_DEVICE");
char * GGML_V2_CLBLAST_PLATFORM = getenv("GGML_OPENCL_PLATFORM");
char * GGML_V2_CLBLAST_DEVICE = getenv("GGML_OPENCL_DEVICE");
int plat_num = (GGML_V2_CLBLAST_PLATFORM == NULL ? 0 : atoi(GGML_V2_CLBLAST_PLATFORM));
int dev_num = (GGML_V2_CLBLAST_DEVICE == NULL ? 0 : atoi(GGML_V2_CLBLAST_DEVICE));
printf("\nInitializing LEGACY v2 CLBlast (First Run)...");