20200313-dldt-disable-unused-targets.patch 7.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158
  1. diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
  2. index d5feedb..1b7aa7e 100644
  3. --- a/inference-engine/CMakeLists.txt
  4. +++ b/inference-engine/CMakeLists.txt
  5. @@ -59,11 +59,11 @@ if(ENABLE_TESTS)
  6. add_subdirectory(tests)
  7. endif()
  8. -add_subdirectory(tools)
  9. +#add_subdirectory(tools)
  10. # gflags and format_reader targets are kept inside of samples directory and
  11. # they must be built even if samples build is disabled (required for tests and tools).
  12. -add_subdirectory(samples)
  13. +#add_subdirectory(samples)
  14. file(GLOB_RECURSE SAMPLES_SOURCES samples/*.cpp samples/*.hpp samples/*.h)
  15. add_cpplint_target(sample_cpplint
  16. @@ -134,7 +134,7 @@ install(DIRECTORY ${ie_python_api_SOURCE_DIR}/sample/
  17. add_custom_target(ie_dev_targets ALL DEPENDS inference_engine HeteroPlugin)
  18. # Developer package
  19. -ie_developer_export_targets(format_reader)
  20. +#ie_developer_export_targets(format_reader)
  21. if (ENABLE_NGRAPH)
  22. ie_developer_export_targets(${NGRAPH_LIBRARIES})
  23. diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
  24. index 54e264c..c0b7495 100644
  25. --- a/inference-engine/src/inference_engine/CMakeLists.txt
  26. +++ b/inference-engine/src/inference_engine/CMakeLists.txt
  27. @@ -228,7 +228,7 @@ target_include_directories(${TARGET_NAME}_nn_builder PRIVATE "${CMAKE_CURRENT_SO
  28. # Static library used for unit tests which are always built
  29. -add_library(${TARGET_NAME}_s STATIC
  30. +add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
  31. $<TARGET_OBJECTS:${TARGET_NAME}_obj>
  32. ${NN_BUILDER_LIBRARY_SRC})
  33. diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
  34. index cd727fd..2f09b44 100644
  35. --- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
  36. +++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
  37. @@ -184,9 +184,9 @@ endif()
  38. add_library(mkldnn_plugin_layers_no_opt OBJECT ${CROSS_COMPILED_SOURCES})
  39. set_ie_threading_interface_for(mkldnn_plugin_layers_no_opt)
  40. -add_library(mkldnn_plugin_layers_no_opt_s OBJECT ${CROSS_COMPILED_SOURCES})
  41. -set_ie_threading_interface_for(mkldnn_plugin_layers_no_opt_s)
  42. -target_compile_definitions(mkldnn_plugin_layers_no_opt_s PRIVATE USE_STATIC_IE)
  43. +#add_library(mkldnn_plugin_layers_no_opt_s OBJECT ${CROSS_COMPILED_SOURCES})
  44. +#set_ie_threading_interface_for(mkldnn_plugin_layers_no_opt_s)
  45. +#target_compile_definitions(mkldnn_plugin_layers_no_opt_s PRIVATE USE_STATIC_IE)
  46. set(object_libraries mkldnn_plugin_layers_no_opt)
  47. set(mkldnn_plugin_object_libraries mkldnn_plugin_layers_no_opt_s)
  48. @@ -220,7 +220,7 @@ if (ENABLE_SSE42)
  49. endfunction()
  50. mkldnn_create_sse42_layers(mkldnn_plugin_layers_sse42)
  51. - mkldnn_create_sse42_layers(mkldnn_plugin_layers_sse42_s)
  52. + #mkldnn_create_sse42_layers(mkldnn_plugin_layers_sse42_s)
  53. list(APPEND object_libraries mkldnn_plugin_layers_sse42)
  54. list(APPEND mkldnn_plugin_object_libraries mkldnn_plugin_layers_sse42_s)
  55. @@ -259,7 +259,7 @@ if (ENABLE_AVX2)
  56. endfunction()
  57. mkldnn_create_avx2_layers(mkldnn_plugin_layers_avx2)
  58. - mkldnn_create_avx2_layers(mkldnn_plugin_layers_avx2_s)
  59. + #mkldnn_create_avx2_layers(mkldnn_plugin_layers_avx2_s)
  60. list(APPEND object_libraries mkldnn_plugin_layers_avx2)
  61. list(APPEND mkldnn_plugin_object_libraries mkldnn_plugin_layers_avx2_s)
  62. @@ -297,7 +297,7 @@ if (ENABLE_AVX512F)
  63. endfunction()
  64. mkldnn_create_avx512f_layers(mkldnn_plugin_layers_avx512)
  65. - mkldnn_create_avx512f_layers(mkldnn_plugin_layers_avx512_s)
  66. + #mkldnn_create_avx512f_layers(mkldnn_plugin_layers_avx512_s)
  67. list(APPEND object_libraries mkldnn_plugin_layers_avx512)
  68. list(APPEND mkldnn_plugin_object_libraries mkldnn_plugin_layers_avx512_s)
  69. @@ -317,7 +317,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine ${INTEL_ITT_LIBS}
  70. # add test object library
  71. -add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
  72. +add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS})
  73. target_include_directories(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:inference_engine_preproc_s,INTERFACE_INCLUDE_DIRECTORIES>)
  74. diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
  75. index 41f14a9..0e1b4f6 100644
  76. --- a/inference-engine/src/preprocessing/CMakeLists.txt
  77. +++ b/inference-engine/src/preprocessing/CMakeLists.txt
  78. @@ -81,7 +81,7 @@ endif()
  79. # Static library used for unit tests which are always built
  80. -add_library(${TARGET_NAME}_s STATIC
  81. +add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
  82. $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
  83. set_ie_threading_interface_for(${TARGET_NAME}_s)
  84. diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt
  85. index 8995390..8413faf 100644
  86. --- a/inference-engine/src/vpu/common/CMakeLists.txt
  87. +++ b/inference-engine/src/vpu/common/CMakeLists.txt
  88. @@ -49,7 +49,7 @@ add_common_target("vpu_common_lib" FALSE)
  89. # Unit tests support for graph transformer
  90. if(WIN32)
  91. - add_common_target("vpu_common_lib_test_static" TRUE)
  92. + #add_common_target("vpu_common_lib_test_static" TRUE)
  93. else()
  94. add_library("vpu_common_lib_test_static" ALIAS "vpu_common_lib")
  95. endif()
  96. diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
  97. index e77296e..333f560 100644
  98. --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
  99. +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
  100. @@ -60,7 +60,7 @@ add_graph_transformer_target("vpu_graph_transformer" FALSE)
  101. # Unit tests support for graph transformer
  102. if(WIN32)
  103. - add_graph_transformer_target("vpu_graph_transformer_test_static" TRUE)
  104. + #add_graph_transformer_target("vpu_graph_transformer_test_static" TRUE)
  105. else()
  106. add_library("vpu_graph_transformer_test_static" ALIAS "vpu_graph_transformer")
  107. endif()
  108. diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
  109. index ec22761..8bb3325 100644
  110. --- a/inference-engine/thirdparty/CMakeLists.txt
  111. +++ b/inference-engine/thirdparty/CMakeLists.txt
  112. @@ -36,7 +36,7 @@ function(build_with_lto)
  113. endif()
  114. add_subdirectory(pugixml)
  115. - add_subdirectory(stb_lib)
  116. + #add_subdirectory(stb_lib)
  117. add_subdirectory(ade)
  118. add_subdirectory(fluid/modules/gapi)
  119. diff --git a/inference-engine/thirdparty/pugixml/CMakeLists.txt b/inference-engine/thirdparty/pugixml/CMakeLists.txt
  120. index 8bcb280..5a17fa3 100644
  121. --- a/inference-engine/thirdparty/pugixml/CMakeLists.txt
  122. +++ b/inference-engine/thirdparty/pugixml/CMakeLists.txt
  123. @@ -41,7 +41,7 @@ if(BUILD_SHARED_LIBS)
  124. else()
  125. add_library(pugixml STATIC ${SOURCES})
  126. if (MSVC)
  127. - add_library(pugixml_mt STATIC ${SOURCES})
  128. + #add_library(pugixml_mt STATIC ${SOURCES})
  129. #if (WIN32)
  130. # set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
  131. # set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")