From af95b1424f722c33b05a24d2f405bf047acc06c9 Mon Sep 17 00:00:00 2001 From: "Meng, Hengyu" Date: Sun, 15 Sep 2024 22:57:56 +0800 Subject: [PATCH 1/3] [SYCL] fix cmake broken --- ggml/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index b25440769..d28babade 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -573,11 +573,11 @@ if (GGML_SYCL) else() if (GGML_SYCL_TARGET STREQUAL "INTEL") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsycl") - list(APPEND GGML_EXTRA_LIBS_PRIVATE OpenCL mkl_core pthread m dl mkl_sycl_blas mkl_intel_ilp64 mkl_tbb_thread) + list(APPEND GGML_EXTRA_LIBS_PRIVATE "-fsycl" OpenCL mkl_core pthread m dl mkl_sycl_blas mkl_intel_ilp64 mkl_tbb_thread) elseif (GGML_SYCL_TARGET STREQUAL "NVIDIA") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsycl") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl-targets=nvptx64-nvidia-cuda") - list(APPEND GGML_EXTRA_LIBS_PRIVATE pthread m dl onemkl) + list(APPEND GGML_EXTRA_LIBS_PRIVATE "-fsycl" pthread m dl onemkl) endif() endif() endif() From 3956cf92a9ff02962957f6a890a0458a740d0de8 Mon Sep 17 00:00:00 2001 From: "Meng, Hengyu" Date: Sun, 15 Sep 2024 23:21:21 +0800 Subject: [PATCH 2/3] Update llama-cli-intel.Dockerfile --- .devops/llama-cli-intel.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/llama-cli-intel.Dockerfile b/.devops/llama-cli-intel.Dockerfile index 79dba06a7..cc611c5de 100644 --- a/.devops/llama-cli-intel.Dockerfile +++ b/.devops/llama-cli-intel.Dockerfile @@ -1,4 +1,4 @@ -ARG ONEAPI_VERSION=2024.1.1-devel-ubuntu22.04 +ARG ONEAPI_VERSION=2024.2.1-0-devel-ubuntu22.04 FROM intel/oneapi-basekit:$ONEAPI_VERSION AS build From 73ef3f769c07eb2fd9800bfce7f30bc7ec597706 Mon Sep 17 00:00:00 2001 From: "Meng, Hengyu" Date: Sun, 15 Sep 2024 23:21:46 +0800 Subject: [PATCH 3/3] Update llama-server-intel.Dockerfile --- .devops/llama-server-intel.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/llama-server-intel.Dockerfile b/.devops/llama-server-intel.Dockerfile index 9c355b664..f3a1692a9 100644 --- a/.devops/llama-server-intel.Dockerfile +++ b/.devops/llama-server-intel.Dockerfile @@ -1,4 +1,4 @@ -ARG ONEAPI_VERSION=2024.1.1-devel-ubuntu22.04 +ARG ONEAPI_VERSION=2024.2.1-0-devel-ubuntu22.04 FROM intel/oneapi-basekit:$ONEAPI_VERSION AS build