opencv: restore sfm module (#349383)
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
, hdf5
|
||||
, boost
|
||||
, glib
|
||||
, glog
|
||||
, gflags
|
||||
, protobuf_21
|
||||
, config
|
||||
@@ -305,6 +306,7 @@ effectiveStdenv.mkDerivation {
|
||||
boost
|
||||
gflags
|
||||
glib
|
||||
glog
|
||||
pcre2
|
||||
protobuf_21
|
||||
zlib
|
||||
@@ -397,11 +399,13 @@ effectiveStdenv.mkDerivation {
|
||||
cmake
|
||||
pkg-config
|
||||
unzip
|
||||
] ++ optionals enablePython [
|
||||
] ++ optionals enablePython ([
|
||||
pythonPackages.pip
|
||||
pythonPackages.wheel
|
||||
pythonPackages.setuptools
|
||||
] ++ optionals enableCuda [
|
||||
] ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
|
||||
pythonPackages.pythonImportsCheckHook
|
||||
]) ++ optionals enableCuda [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
@@ -545,6 +549,8 @@ effectiveStdenv.mkDerivation {
|
||||
popd
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "cv2" "cv2.sfm" ];
|
||||
|
||||
passthru = {
|
||||
cudaSupport = enableCuda;
|
||||
|
||||
|
||||
@@ -49,8 +49,9 @@ let
|
||||
export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata"
|
||||
export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data"
|
||||
|
||||
#ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11"
|
||||
export GTEST_FILTER="-AsyncAPICancelation/cancel*"
|
||||
# ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11"
|
||||
# ignore test due to numerical instability
|
||||
export GTEST_FILTER="-AsyncAPICancelation/cancel*:Photo_CalibrateDebevec.regression"
|
||||
'';
|
||||
accuracyTests = lib.optionalString runAccuracyTests ''
|
||||
${ builtins.concatStringsSep "\n"
|
||||
|
||||
Reference in New Issue
Block a user