diff --git a/CMakeLists.txt b/CMakeLists.txt index 96a8a393817d3..e047785e603d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (GGML_TSAVORITE) if (NOT DEFINED MLIR_COMPILER_DIR) if (NOT DEFINED $ENV{MLIR_SDK_VERSION}) - set (MLIR_COMPILER_DIR /proj/work/rel/sw/sdk-r.0.1.1/compiler) + set (MLIR_COMPILER_DIR /proj/work/rel/sw/sdk-r.0.1.2/compiler) else() set (MLIR_COMPILER_DIR $ENV{MLIR_SDK_VERSION}/compiler) endif() @@ -23,7 +23,7 @@ if (GGML_TSAVORITE) if (NOT DEFINED RUNTIME_DIR) if (NOT DEFINED $ENV{MLIR_SDK_VERSION}) - set (RUNTIME_DIR /proj/work/rel/sw/sdk-r.0.1.0/${GGML_TSAVORITE_TARGET}/runtime) + set (RUNTIME_DIR /proj/work/rel/sw/sdk-r.0.1.2/${GGML_TSAVORITE_TARGET}/runtime) else() set (RUNTIME_DIR $ENV{MLIR_SDK_VERSION}/${GGML_TSAVORITE_TARGET}/runtime) endif() diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt index 1d4259dae5ba7..2cbae62a1dddf 100644 --- a/ggml/src/ggml-cpu/CMakeLists.txt +++ b/ggml/src/ggml-cpu/CMakeLists.txt @@ -53,14 +53,18 @@ function(ggml_add_cpu_backend_variant_impl tag_name) endif() endif() - if (GGML_OPENMP) - find_package(OpenMP) - if (OpenMP_FOUND) - target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_OPENMP) + if (${GGML_TSAVORITE_TARGET} STREQUAL fpga) + message("Target is FPGA no GOMP linked") + else() + if (GGML_OPENMP) + find_package(OpenMP) + if (OpenMP_FOUND) + target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_OPENMP) - target_link_libraries(${GGML_CPU_NAME} PRIVATE OpenMP::OpenMP_C OpenMP::OpenMP_CXX) - else() - message(WARNING "OpenMP not found") + target_link_libraries(${GGML_CPU_NAME} PRIVATE OpenMP::OpenMP_C OpenMP::OpenMP_CXX) + else() + message(WARNING "OpenMP not found") + endif() endif() endif() diff --git a/tsi-pkg-build.sh b/tsi-pkg-build.sh index 5ff9b9389c475..b6b998671544c 100755 --- a/tsi-pkg-build.sh +++ b/tsi-pkg-build.sh @@ -31,7 +31,7 @@ cd ../posix-kernel/ cd ../../ -export MLIR_SDK_VERSION=/proj/work/rel/sw/sdk-r.0.1.1 +export MLIR_SDK_VERSION=/proj/work/rel/sw/sdk-r.0.1.2 #Compile for posix with build-posix as a target folder echo 'building llama.cp, ggml for tsavorite and other binary for posix'