Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick some changes to llama branch #26709

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Cherry pick some changes to llama branch #26709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f155697
[Build] Fix CPU plugin build with DPCPP
vladimir-paramuzov Sep 20, 2024
e52ca33
remove duplicated file
vladimir-paramuzov Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/developer_package/compile_flags/os_flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ macro(ov_avx512_optimization_flags flags)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(${flags} /arch:AVX512)
elseif(OV_COMPILER_IS_INTEL_LLVM AND WIN32)
set(${flags} /QxCOMMON-AVX512)
set(${flags} /QxCORE-AVX512)
elseif(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX OR (OV_COMPILER_IS_INTEL_LLVM AND UNIX))
set(${flags} -mavx512f -mavx512bw -mavx512vl -mfma -mf16c)
else()
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/intel_cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
ov_add_compiler_flags(-Wno-array-bounds)
endif()
elseif (OV_COMPILER_IS_INTEL_LLVM AND WIN32)
ov_add_compiler_flags("/Wno-microsoft-include")
endif()

if(NOT BUILD_SHARED_LIBS)
# Symbols are located in both src and include folders
file(GLOB_RECURSE onednn_files
Expand Down Expand Up @@ -130,8 +131,9 @@ set(OV_CPU_ARM_TARGET_ARCH ${OV_CPU_ARM_TARGET_ARCH_DEFAULT} CACHE STRING "Archi
set_property(CACHE OV_CPU_ARM_TARGET_ARCH PROPERTY STRINGS ${OV_CPU_ARM_TARGET_ARCHS})

if(X86 OR X86_64 OR AARCH64)
# disable mlas with webassembly
if(EMSCRIPTEN OR (WIN32 AND AARCH64) OR MINGW OR (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7))
# disable mlas with webassembly and intel compiler on windows
if(EMSCRIPTEN OR (WIN32 AND AARCH64) OR MINGW OR
(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7) OR (OV_COMPILER_IS_INTEL_LLVM AND WIN32))
set(ENABLE_MLAS_FOR_CPU_DEFAULT OFF)
else()
set(ENABLE_MLAS_FOR_CPU_DEFAULT ON)
Expand Down
48 changes: 0 additions & 48 deletions src/plugins/intel_gpu/src/graph/impls/registry/implementations_manager.cpp
View file
Open in desktop

This file was deleted.

Loading