pyrox.dev / nixpkgs
lol
fork atom

opencv: update cuda_opt_flow.patch

authored by

Artturin and committed by
Jonathan Ringer 044fd194 2804657c

+26 -25
+1 -1
pkgs/development/libraries/opencv/4.x.nix
··· 301 301 "-DCUDA_FAST_MATH=ON" 302 302 "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" 303 303 "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" 304 - "-DNVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" 304 + "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" 305 305 ] ++ lib.optionals stdenv.isDarwin [ 306 306 "-DWITH_OPENCL=OFF" 307 307 "-DWITH_LAPACK=OFF"
+25 -24
pkgs/development/libraries/opencv/cuda_opt_flow.patch
··· 1 - diff --git a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt 2 - index e5b823ab4a..a728060d0b 100644 3 - --- a/opencv_contrib/cudaoptflow/CMakeLists.txt 4 - +++ b/opencv_contrib/cudaoptflow/CMakeLists.txt 5 - @@ -11,18 +11,6 @@ ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm open 6 - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT "79c6cee80a2df9a196f20afd6b598a9810964c32") 7 - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5 "ca5acedee6cb45d0ec610a6732de5c15") 8 - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_1_0_Headers") 9 - -ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}.zip" 10 - - HASH ${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5} 11 - - URL 12 - - "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" 13 - - DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}" 14 - - STATUS NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS 15 - - ID "NVIDIA_OPTICAL_FLOW" 16 - - UNPACK RELATIVE_URL) 17 - 18 - -if(NOT NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS) 19 - - message(STATUS "Failed to download NVIDIA_Optical_Flow_1_0 Headers") 20 - -else() 21 - - add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) 22 - - ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}") 1 + diff --unified --recursive --text a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt 2 + --- a/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:35:47.536395972 +0300 3 + +++ b/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:36:02.029498597 +0300 4 + @@ -12,19 +12,6 @@ 5 + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT "edb50da3cf849840d680249aa6dbef248ebce2ca") 6 + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5 "a73cd48b18dcc0cc8933b30796074191") 7 + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_2_0_Headers") 8 + - ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}.zip" 9 + - HASH ${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5} 10 + - URL "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" 11 + - DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}" 12 + - STATUS NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS 13 + - ID "NVIDIA_OPTICAL_FLOW" 14 + - UNPACK RELATIVE_URL) 15 + - 16 + - if(NOT NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS) 17 + - message(STATUS "Failed to download NVIDIA_Optical_Flow_2_0 Headers") 18 + - else() 19 + - message(STATUS "Building with NVIDIA Optical Flow API 2.0") 20 + - add_definitions(-DHAVE_NVIDIA_OPTFLOW=2) 21 + - ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}") 22 + - endif() 23 23 -endif() 24 24 \ No newline at end of file 25 - +add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) 26 - +ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}") 25 + + add_definitions(-DHAVE_NVIDIA_OPTFLOW=2) 26 + + ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}") 27 + +endif()