vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clear CMAKE to rm unused lib and options

Browse source
This commit is contained in:
jianyuzh 2024-01-09 09:37:54 +08:00 • committed by Meng, Hengyu
parent c709c3cb37
commit fa3a58605b
2 changed files with 14 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

48
CMakeLists.txt
View file

@ -448,39 +448,19 @@ endif()
if (LLAMA_SYCL) if (LLAMA_SYCL)
set(ENABLE_AOT ats) if ( NOT DEFINED ENV{ONEAPI_ROOT})
if (NOT ${CMAKE_C_COMPILER_ID} MATCHES "IntelLLVM") message(FATAL_ERROR "Not detect ENV {ONEAPI_ROOT}, please install oneAPI & source it, like: source /opt/intel/oneapi/setvars.sh")
message(WARNING "${CMAKE_C_COMPILER_ID} Need IntelLLVM for SYCL")
endif()
if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "IntelLLVM")
message(WARNING "${CMAKE_CXX_COMPILER_ID} Need IntelLLVM for SYCL")
endif() endif()
#todo: AOT
find_package(IntelSYCL REQUIRED) find_package(IntelSYCL REQUIRED)
# Check SYCL support by the compiler
check_cxx_compiler_flag("-fsycl" _fsycl_option)
if (_fsycl_option)
#set (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} "/opt/intel/oneapi/compiler/2024.0/include")
CHECK_INCLUDE_FILE_CXX("sycl/sycl.hpp" _sycl_header "-fsycl")
set (_sycl_header "/opt/intel/oneapi/compiler/2024.0/include/sycl/sycl.hpp")
if (NOT _sycl_header)
CHECK_INCLUDE_FILE_CXX("CL/sycl.hpp" _sycl_header_old "-fsycl")
endif()
if (_sycl_header OR _sycl_header_old)
set(_sycl_support TRUE)
endif()
endif()
if (_sycl_support)
#add_compile_definitions(GGML_USE_CUBLAS)
add_compile_definitions(GGML_USE_SYCL)
#add_compile_definitions(GGML_SYCL_F16) #add_compile_definitions(GGML_SYCL_F16)
add_compile_options(-I./) add_compile_definitions(GGML_USE_SYCL)
add_compile_options(-I/opt/intel/oneapi/compiler/2024.0/include)
add_compile_options(-I/opt/intel/oneapi/compiler/2024.0/include/sycl) add_compile_options(-I./) #include DPCT
add_compile_options(-I/opt/intel/oneapi/dpcpp-ct/2024.0/include) add_compile_options(-I/${ONEAPI_ROOT}/2024.0/include)
add_compile_options(-I/opt/intel/oneapi/2024.0/include)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wno-narrowing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wno-narrowing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
@ -489,18 +469,8 @@ if (LLAMA_SYCL)
set(GGML_HEADERS_SYCL ggml.h ggml-sycl.h) set(GGML_HEADERS_SYCL ggml.h ggml-sycl.h)
set(GGML_SOURCES_SYCL ggml-sycl.cpp) set(GGML_SOURCES_SYCL ggml-sycl.cpp)
set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} sycl OpenCL mkl_core pthread m dl mkl_sycl_blas mkl_sycl_lapack mkl_sycl_dft mkl_sycl_sparse mkl_sycl_vm mkl_sycl_rng mkl_sycl_stats mkl_sycl_data_fitting mkl_intel_ilp64 mkl_tbb_thread) set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} sycl OpenCL mkl_core pthread m dl mkl_sycl_blas mkl_intel_ilp64 mkl_tbb_thread)
#add_library(ggml-sycl OBJECT ${GGML_SOURCES_SYCL} ${GGML_HEADERS_SYCL})
#add_executable(${PROJECT_NAME} ${GGML_SOURCES_SYCL} ${GGML_HEADERS_SYCL})
#target_link_libraries(ggml-sycl PRIVATE sycl)
#target_compile_options(${PROJECT_NAME} PRIVATE ${CMAKE_CXX_FLAGS})
#set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} sycl)
#add_sycl_to_target({})
else()
message(FATAL_ERROR "SYCL Support is not present")
endif()
endif() endif()

18
migrate.sh
View file

@ -1,18 +0,0 @@
echo "modify the ggml-sycl.cpp to fix dpct result error"
TARGET_FILE=ggml-sycl.cpp
sed -i "s/CUDA_CHECK(id = dpct::dev_mgr::instance().current_device_id());/id = dpct::dev_mgr::instance().current_device_id();/g" ${TARGET_FILE}
sed -i "s/CUDA_CHECK(current_device = dpct::dev_mgr::instance().current_device_id());/current_device = dpct::dev_mgr::instance().current_device_id();/g" ${TARGET_FILE}
sed -i "s/g_cublas_handles, oneapi::mkl::transpose::trans,/*g_cublas_handles[id], oneapi::mkl::transpose::trans,/g" ${TARGET_FILE}
sed -i "s/cu_compute_type = CUBLAS_COMPUTE_16F;/cu_compute_type = dpct::library_data_t::real_half;/g" ${TARGET_FILE}
sed -i "s/cu_compute_type = CUBLAS_COMPUTE_32F;/cu_compute_type = dpct::library_data_t::real_float;/g" ${TARGET_FILE}
sed -i "s/tmp += vec_dot_q_cuda(&x[ibx], &y[iby], iqs, stream_ct1);/tmp += vec_dot_q_cuda(&x[ibx], &y[iby], iqs);/g" ${TARGET_FILE}
sed -i "s/cuGetErrorString(err, &err_str);/\/\/cuGetErrorString(err, &err_str);/g" ${TARGET_FILE}
#set empty function
#ggml_cuda_set_peer_access
#ggml_cuda_pool_malloc_vmm
#ggml_cuda_pool_free_vmm
#replace tmp += vec_dot_q_cuda(&x[ibx], &y[iby], iqs, stream_ct1);/tmp += vec_dot_q_cuda(&x[ibx], &y[iby], iqs);
echo "done"