2019-03-01 16:28:49 +08:00
|
|
|
if("${CMAKE_BUILD_TYPE}" STREQUAL "")
|
|
|
|
|
set(CMAKE_BUILD_TYPE "Release")
|
|
|
|
|
endif()
|
|
|
|
|
|
2018-10-31 20:53:01 +08:00
|
|
|
if (NOT TARGET ade )
|
|
|
|
|
find_package(ade 0.1.0 REQUIRED)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
set(FLUID_TARGET fluid)
|
|
|
|
|
set(FLUID_ROOT "${CMAKE_CURRENT_LIST_DIR}/../")
|
|
|
|
|
|
|
|
|
|
file(GLOB FLUID_includes "${FLUID_ROOT}/include/opencv2/*.hpp"
|
|
|
|
|
"${FLUID_ROOT}/include/opencv2/gapi/g*.hpp"
|
|
|
|
|
"${FLUID_ROOT}/include/opencv2/gapi/util/*.hpp"
|
|
|
|
|
"${FLUID_ROOT}/include/opencv2/gapi/own/*.hpp"
|
|
|
|
|
"${FLUID_ROOT}/include/opencv2/gapi/fluid/*.hpp")
|
|
|
|
|
file(GLOB FLUID_sources "${FLUID_ROOT}/src/api/g*.cpp"
|
|
|
|
|
"${FLUID_ROOT}/src/compiler/*.cpp"
|
|
|
|
|
"${FLUID_ROOT}/src/compiler/passes/*.cpp"
|
|
|
|
|
"${FLUID_ROOT}/src/executor/*.cpp"
|
|
|
|
|
"${FLUID_ROOT}/src/backends/fluid/*.cpp"
|
|
|
|
|
"${FLUID_ROOT}/src/backends/common/*.cpp")
|
|
|
|
|
|
|
|
|
|
add_library(${FLUID_TARGET} STATIC ${FLUID_includes} ${FLUID_sources})
|
|
|
|
|
|
|
|
|
|
target_include_directories(${FLUID_TARGET}
|
|
|
|
|
PUBLIC $<BUILD_INTERFACE:${FLUID_ROOT}/include>
|
|
|
|
|
PRIVATE ${FLUID_ROOT}/src)
|
|
|
|
|
|
2019-03-01 16:28:49 +08:00
|
|
|
target_compile_definitions(${FLUID_TARGET} PUBLIC GAPI_STANDALONE
|
2018-10-31 20:53:01 +08:00
|
|
|
# This preprocessor definition resolves symbol clash when
|
|
|
|
|
# standalone fluid meets gapi ocv module in one application
|
|
|
|
|
PUBLIC cv=fluidcv)
|
|
|
|
|
|
|
|
|
|
set_target_properties(${FLUID_TARGET} PROPERTIES POSITION_INDEPENDENT_CODE True)
|
|
|
|
|
set_property(TARGET ${FLUID_TARGET} PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
2019-03-01 16:28:49 +08:00
|
|
|
if(MSVC)
|
|
|
|
|
target_compile_options(${FLUID_TARGET} PUBLIC "/wd4251")
|
2019-05-31 22:22:12 +08:00
|
|
|
target_compile_options(${FLUID_TARGET} PUBLIC "/wd4275")
|
2019-03-01 16:28:49 +08:00
|
|
|
target_compile_definitions(${FLUID_TARGET} PRIVATE _CRT_SECURE_NO_DEPRECATE)
|
Merge pull request #15216 from dmatveev:dm/ng-0010-g-api-streaming-api
* G-API-NG/Streaming: Introduced a Streaming API
Now a GComputation can be compiled in a special "streaming" way
and then "played" on a video stream.
Currently only VideoCapture is supported as an input source.
* G-API-NG/Streaming: added threading & real streaming
* G-API-NG/Streaming: Added tests & docs on Copy kernel
- Added very simple pipeline tests, not all data types are covered yet
(in fact, only GMat is tested now);
- Started testing non-OCV backends in the streaming mode;
- Added required fixes to Fluid backend, likely it works OK now;
- Added required fixes to OCL backend, and now it is likely broken
- Also added a UMat-based (OCL) version of Copy kernel
* G-API-NG/Streaming: Added own concurrent queue class
- Used only if TBB is not available
* G-API-NG/Streaming: Fixing various issues
- Added missing header to CMakeLists.txt
- Fixed various CI issues and warnings
* G-API-NG/Streaming: Fixed a compile-time GScalar queue deadlock
- GStreamingExecutor blindly created island's input queues for
compile-time (value-initialized) GScalars which didn't have any
producers, making island actor threads wait there forever
* G-API-NG/Streaming: Dropped own version of Copy kernel
One was added into master already
* G-API-NG/Streaming: Addressed GArray<T> review comments
- Added tests on mov()
- Removed unnecessary changes in garray.hpp
* G-API-NG/Streaming: Added Doxygen comments to new public APIs
Also fixed some other comments in the code
* G-API-NG/Streaming: Removed debug info, added some comments & renamed vars
* G-API-NG/Streaming: Fixed own-vs-cv abstraction leak
- Now every island is triggered with own:: (instead of cv::)
data objects as inputs;
- Changes in Fluid backend required to support cv::Mat/Scalar were
reverted;
* G-API-NG/Streaming: use holds_alternative<> instead of index/index_of test
- Also fixed regression test comments
- Also added metadata check comments for GStreamingCompiled
* G-API-NG/Streaming: Made start()/stop() more robust
- Fixed various possible deadlocks
- Unified the shutdown code
- Added more tests covering different corner cases on start/stop
* G-API-NG/Streaming: Finally fixed Windows crashes
In fact the problem hasn't been Windows-only.
Island thread popped data from queues without preserving the Cmd
objects and without taking the ownership over data acquired so when
islands started to process the data, this data may be already freed.
Linux version worked only by occasion.
* G-API-NG/Streaming: Fixed (I hope so) Windows warnings
* G-API-NG/Streaming: fixed typos in internal comments
- Also added some more explanation on Streaming/OpenCL status
* G-API-NG/Streaming: Added more unit tests on streaming
- Various start()/stop()/setSource() call flow combinations
* G-API-NG/Streaming: Added tests on own concurrent bounded queue
* G-API-NG/Streaming: Added more tests on various data types, + more
- Vector/Scalar passed as input;
- Vector/Scalar passed in-between islands;
- Some more assertions;
- Also fixed a deadlock problem when inputs are mixed (1 constant, 1 stream)
* G-API-NG/Streaming: Added tests on output data types handling
- Vector
- Scalar
* G-API-NG/Streaming: Fixed test issues with IE + Windows warnings
* G-API-NG/Streaming: Decoupled G-API from videoio
- Now the core G-API doesn't use a cv::VideoCapture directly,
it comes in via an abstract interface;
- Polished a little bit the setSource()/start()/stop() semantics,
now setSource() is mandatory before ANY call to start().
* G-API-NG/Streaming: Fix STANDALONE build (errors brought by render)
2019-10-19 00:29:58 +08:00
|
|
|
# Disable obsollete warning C4503 popping up on MSVC <<2017
|
|
|
|
|
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4503?view=vs-2019
|
|
|
|
|
set_target_properties(${FLUID_TARGET} PROPERTIES COMPILE_FLAGS "/wd4503")
|
2019-03-01 16:28:49 +08:00
|
|
|
endif()
|
|
|
|
|
|
2018-10-31 20:53:01 +08:00
|
|
|
target_link_libraries(${FLUID_TARGET} PRIVATE ade)
|
2020-09-24 22:40:43 +08:00
|
|
|
|
|
|
|
|
if(WIN32)
|
|
|
|
|
# Required for htonl/ntohl on Windows
|
|
|
|
|
target_link_libraries(${FLUID_TARGET} PRIVATE wsock32 ws2_32)
|
|
|
|
|
endif()
|