Merge pull request #124 from ilya-lavrenov/upcast_randn_to_f32

Upcast randn to f32
pavel-esir · Dec 6, 2023 · 5fa00ce · 5fa00ce
2 parents 1bd8b24 + e0aa4f8
commit 5fa00ce
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
@@ -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)

diff --git a/src/core/tests/frontend/CMakeLists.txt b/src/core/tests/frontend/CMakeLists.txt
@@ -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})
 

diff --git a/src/frontends/common/CMakeLists.txt b/src/frontends/common/CMakeLists.txt
@@ -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})
 
@@ -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)
 
@@ -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

diff --git a/src/frontends/common/include/openvino/frontend/visibility.hpp b/src/frontends/common/include/openvino/frontend/visibility.hpp
@@ -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
@@ -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
diff --git a/src/plugins/intel_cpu/tests/unit/CMakeLists.txt b/src/plugins/intel_cpu/tests/unit/CMakeLists.txt
@@ -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