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.

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

Introduce IEDevScripts package #3661

Merged
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a1c730a
Refactored developer package
ilya-lavrenov Nov 30, 2020
a9f90d2
Merge remote-tracking branch 'upstream/master' into developer-package…
ilya-lavrenov Dec 17, 2020
35ad4aa
Added fuzzing for CMAKE_MODULE_LINKER_FLAGS as well
ilya-lavrenov Dec 17, 2020
ae6a6c6
Added options for developer package
ilya-lavrenov Dec 17, 2020
8de532e
More improvements
ilya-lavrenov Dec 17, 2020
a601bd3
Further improvements
ilya-lavrenov Dec 17, 2020
5440264
Removed global CMAKE_MODULE_PATH population
ilya-lavrenov Dec 17, 2020
835d9d0
Fixes
ilya-lavrenov Dec 17, 2020
1740df3
Final fixes
ilya-lavrenov Dec 17, 2020
1b30a42
Fixed python build
ilya-lavrenov Dec 17, 2020
a05d066
Fix for TBB
ilya-lavrenov Dec 17, 2020
f9bec81
Fixed Find TBB
ilya-lavrenov Dec 17, 2020
f86a8c2
Fixed install
ilya-lavrenov Dec 17, 2020
4fbf86d
Fixes for OV features
ilya-lavrenov Dec 17, 2020
9e5f46e
Split developer targets per component
ilya-lavrenov Dec 17, 2020
1ad399b
Fixed IE build tree config
ilya-lavrenov Dec 17, 2020
fcced37
Fixed ITT
ilya-lavrenov Dec 17, 2020
f2a1e79
Fixed review comments
ilya-lavrenov Dec 18, 2020
629d8b0
Merge remote-tracking branch 'upstream/master' into developer-package…
ilya-lavrenov Dec 20, 2020
4995c10
Merge remote-tracking branch 'upstream/master' into developer-package…
ilya-lavrenov Dec 21, 2020
7b19d72
Clean export dependencies
ilya-lavrenov Dec 21, 2020
10a0a1f
Fixed export of pugixml
ilya-lavrenov Dec 21, 2020
36445a1
Merge remote-tracking branch 'upstream/master' into developer-package…
ilya-lavrenov Dec 21, 2020
e489c31
Added IEDevScripts_DIR for Android
ilya-lavrenov Dec 21, 2020
069d6ec
Fixed Android #2
ilya-lavrenov Dec 21, 2020
164edc2
Fixed Android #3
ilya-lavrenov Dec 21, 2020
3e67024
Fixed python cc
ilya-lavrenov Dec 21, 2020
f4c855f
Merge remote-tracking branch 'upstream/master' into developer-package…
ilya-lavrenov Dec 21, 2020
d062a31
Merge remote-tracking branch 'upstream/master' into developer-package…
ilya-lavrenov Dec 22, 2020
3d9f307
Disabled Core threading tests on GNA
ilya-lavrenov Dec 22, 2020
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
Prev Previous commit
Next Next commit
Removed global CMAKE_MODULE_PATH population
ilya-lavrenov committed Dec 17, 2020

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 5440264f96a443c5a95488fae3d9963f33a3c47b
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -45,7 +45,6 @@ function(build_ngraph)
endfunction()

set(NGRAPH_BUILD_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE STRING "" FORCE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OpenVINO_MAIN_SOURCE_DIR}/ngraph/cmake/Modules/")

if (ENABLE_SANITIZER)
ngraph_set(NGRAPH_ADDRESS_SANITIZER TRUE)
5 changes: 2 additions & 3 deletions inference-engine/ie_bridges/python/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ cmake_minimum_required (VERSION 3.13)

# Set the project name
project (ie_python_api)
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")

option(ENABLE_CONDA_FOLDER "Create output folder with conda python bindings" OFF)

@@ -30,7 +29,7 @@ if(UNIX)
set(CMAKE_C_VISIBILITY_PRESET default)
endif()

include (UseCython)
include (cmake/UseCython.cmake)

if(PYTHONINTERP_FOUND)
set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
@@ -56,7 +55,7 @@ set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory (src/openvino/inference_engine)

# Check Cython version
if("${CYTHON_VERSION}" VERSION_LESS "0.29")
if(CYTHON_VERSION VERSION_LESS "0.29")
message(FATAL_ERROR "OpenVINO Python API needs at least Cython version 0.29, found version ${CYTHON_VERSION}")
else()
message(STATUS "Found Cython version ${CYTHON_VERSION}")
8 changes: 2 additions & 6 deletions ngraph/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -15,11 +15,7 @@
# ******************************************************************************

# set directory where the custom finders live
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")

if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
message(FATAL_ERROR "In-source builds are not allowed.")
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")

if (CMAKE_BUILD_TYPE)
set(RELEASE_TYPES Debug Release RelWithDebInfo MinSizeRel)
@@ -415,7 +411,7 @@ if(NGRAPH_DEPRECATED_ENABLE)
add_definitions(-DNGRAPH_DEPRECATED_ENABLE)
endif()

add_definitions(-DPROJECT_ROOT_DIR="${CMAKE_SOURCE_DIR}")
add_definitions(-DPROJECT_ROOT_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

#-----------------------------------------------------------------------------------------------
# Print Global Options
6 changes: 3 additions & 3 deletions openvino/itt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

set(TARGET_NAME itt)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.hpp")

if(ENABLE_PROFILING_ITT)
if(DEFINED INTEL_VTUNE_DIR OR DEFINED ENV{INTEL_VTUNE_DIR})
find_package(ITT)
find_package(ITT
PATHS "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
NO_DEFAULT_PATH)
if(NOT ITT_FOUND)
message(WARNING "Profiling option enabled, but no ITT library was found under INTEL_VTUNE_DIR")
endif()
4 changes: 2 additions & 2 deletions tests/fuzz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)

set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package" ${CMAKE_MODULE_PATH})

if (CMAKE_BUILD_TYPE STREQUAL "")
message(STATUS "CMAKE_BUILD_TYPE not defined, 'Release' will be used")
@@ -16,7 +16,7 @@ if (NOT TARGET IE::inference_engine)
find_package(InferenceEngineDeveloperPackage REQUIRED)
endif()

include(sanitizer)
include(compile_flags/sanitizer)
include(fuzzing)

if (NOT ENABLE_FUZZING)