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

Upcast randn to f32 #124

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Upcast randn to f32 #124

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
02530c2
Fixed build: attemp 2
ilya-lavrenov Dec 6, 2023
e0aa4f8
Merge remote-tracking branch 'pavel-esir/upcast_randn_to_f32' into up…
ilya-lavrenov Dec 6, 2023
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
3 changes: 2 additions & 1 deletion cmake/developer_package/frontends/frontends.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,14 @@ macro(ov_add_frontend)
PUBLIC
$<BUILD_INTERFACE:${${TARGET_NAME}_INCLUDE_DIR}>
PRIVATE
$<TARGET_PROPERTY:openvino::frontend::common,INTERFACE_INCLUDE_DIRECTORIES>
${frontend_root_dir}/src
${CMAKE_CURRENT_BINARY_DIR})

ov_add_vs_version_file(NAME ${TARGET_NAME}
FILEDESCRIPTION ${OV_FRONTEND_FILEDESCRIPTION})

target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES} openvino::frontend::common PUBLIC openvino::runtime)
target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES} PUBLIC openvino::runtime)
ov_add_library_version(${TARGET_NAME})

if(OV_FRONTEND_PROTOBUF_REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions src/core/tests/frontend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ target_compile_definitions(${MOCK1_FE_NAME} PRIVATE "-DMOCK_VARIANT=\"1\"")

target_include_directories(${MOCK1_FE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

target_link_libraries(${MOCK1_FE_NAME} PRIVATE openvino_frontend_common)
add_dependencies(ov_core_unit_tests ${MOCK1_FE_NAME} openvino_frontend_common)
target_link_libraries(${MOCK1_FE_NAME} PRIVATE openvino::frontend::common)
add_dependencies(ov_core_unit_tests ${MOCK1_FE_NAME})

ov_add_clang_format_target(${MOCK1_FE_NAME}_clang FOR_TARGETS ${MOCK1_FE_NAME})

Expand Down
9 changes: 5 additions & 4 deletions src/frontends/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ add_library(${TARGET_NAME} INTERFACE)

target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${FRONTEND_DEV_INCLUDE_DIR}>
$<BUILD_INTERFACE:${FRONTEND_INCLUDE_DIR}>
$<TARGET_PROPERTY:openvino::runtime,INTERFACE_INCLUDE_DIRECTORIES>)
$<BUILD_INTERFACE:${FRONTEND_INCLUDE_DIR}>)

target_link_libraries(${TARGET_NAME} INTERFACE openvino::runtime)

add_library(openvino::frontend::common ALIAS ${TARGET_NAME})

Expand All @@ -37,7 +38,7 @@ target_include_directories(${TARGET_NAME}_obj
$<BUILD_INTERFACE:${FRONTEND_INCLUDE_DIR}>
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::frontend::common,INTERFACE_INCLUDE_DIRECTORIES>
# for ov_frontends.hpp in static build
${CMAKE_CURRENT_BINARY_DIR}/src)

Expand All @@ -47,7 +48,7 @@ if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(${TARGET_NAME}_obj PUBLIC OPENVINO_STATIC_LIBRARY)
endif()

target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::util openvino::core::dev openvino::frontend::common)
target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::util openvino::core::dev)

# TODO: fix lto
set_target_properties(${TARGET_NAME}_obj PROPERTIES
Expand Down
6 changes: 3 additions & 3 deletions src/frontends/common/include/openvino/frontend/visibility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Increment each time when FrontEnd/InputModel/Place interface is changed
#define OV_FRONTEND_API_VERSION 1

#if defined(USE_STATIC_FRONTEND_COMMON) || defined(OPENVINO_STATIC_LIBRARY)
#if defined(OPENVINO_STATIC_LIBRARY)
# define FRONTEND_API
# define FRONTEND_C_API
#else
Expand All @@ -20,5 +20,5 @@
# else
# define FRONTEND_API OPENVINO_CORE_IMPORTS
# define FRONTEND_C_API OPENVINO_EXTERN_C OPENVINO_CORE_IMPORTS
# endif // frontend_common_EXPORTS
#endif // USE_STATIC_FRONTEND_COMMON || OPENVINO_STATIC_LIBRARY
# endif // openvino_frontend_common_EXPORTS
#endif // OPENVINO_STATIC_LIBRARY
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ ov_add_test_target(
inference_engine_lp_transformations
openvino::shape_inference
inference_engine_s
openvino_frontend_common_obj
unit_test_utils
ov_models
ov_snippets_models
Expand Down
Loading