tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom

opencv: restore sfm module (#349383)

authored by misuzu.tngl.sh and committed by

GitHub ea772f11 c2dae3e3

+11 -4
+8 -2
pkgs/development/libraries/opencv/4.x.nix
··· 10 10 , hdf5 11 11 , boost 12 12 , glib 13 + , glog 13 14 , gflags 14 15 , protobuf_21 15 16 , config ··· 306 305 boost 307 306 gflags 308 307 glib 308 + glog 309 309 pcre2 310 310 protobuf_21 311 311 zlib ··· 399 397 cmake 400 398 pkg-config 401 399 unzip 402 - ] ++ optionals enablePython [ 400 + ] ++ optionals enablePython ([ 403 401 pythonPackages.pip 404 402 pythonPackages.wheel 405 403 pythonPackages.setuptools 406 - ] ++ optionals enableCuda [ 404 + ] ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [ 405 + pythonPackages.pythonImportsCheckHook 406 + ]) ++ optionals enableCuda [ 407 407 cudaPackages.cuda_nvcc 408 408 ]; 409 409 ··· 548 544 popd 549 545 popd 550 546 ''; 547 + 548 + pythonImportsCheck = [ "cv2" "cv2.sfm" ]; 551 549 552 550 passthru = { 553 551 cudaSupport = enableCuda;
+3 -2
pkgs/development/libraries/opencv/tests.nix
··· 49 49 export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata" 50 50 export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data" 51 51 52 - #ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11" 53 - export GTEST_FILTER="-AsyncAPICancelation/cancel*" 52 + # ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11" 53 + # ignore test due to numerical instability 54 + export GTEST_FILTER="-AsyncAPICancelation/cancel*:Photo_CalibrateDebevec.regression" 54 55 ''; 55 56 accuracyTests = lib.optionalString runAccuracyTests '' 56 57 ${ builtins.concatStringsSep "\n"