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.

Sign up for GitHub

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

Jump to bottom

opencv: 3.3.0 -> 3.3.1 #30946

Merged
merged 1 commit into from Nov 22, 2017
Merged

opencv: 3.3.0 -> 3.3.1 #30946

merged 1 commit into from Nov 22, 2017

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Oct 30, 2017 •
edited

Motivation for this change

New release: https://github.com/opencv/opencv/releases/tag/3.3.1

Things done

The following builds on x86_64-linux and x86_64-darwin:

nix-build -E '(import ./. {}).opencv3.override {enableIpp = true; enableContrib = true;}' --option build-use-sandbox true
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@FRidh
Copy link
Member

FRidh commented Oct 30, 2017

@basvandijk please use the template.

@basvandijk
Copy link
Member Author

@FRidh good point, I added it back.

@basvandijk basvandijk mentioned this pull request Oct 31, 2017
Closed
8 tasks
@basvandijk
Copy link
Member Author

@globin care to review?

@NeQuissimus
Copy link
Member

@GrahamcOfBorg opencv

orivej
orivej suggested changes Nov 5, 2017
View reviewed changes
Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This update breaks the compilation of pythonPackages.opencv3 and python3Packages.opencv3:

make[2]: *** No rule to make target 'modules/dnn/attr_value.pb.cc', needed by 'modules/python2/pyopencv_generated_include.h'.  Stop.
make[1]: *** [CMakeFiles/Makefile2:7085: modules/python2/CMakeFiles/gen_opencv_python2.dir/all] Error 2

make[2]: *** No rule to make target 'modules/dnn/attr_value.pb.cc', needed by 'modules/python3/pyopencv_generated_include.h'.  Stop.
make[1]: *** [CMakeFiles/Makefile2:7031: modules/python3/CMakeFiles/gen_opencv_python3.dir/all] Error 2

@basvandijk
Copy link
Member Author

@orivej I get the same. I'll look into it.

@basvandijk
Copy link
Member Author

I force-pushed a change where I removed the -DBUILD_PROTOBUF=OFF and -DPROTOBUF_UPDATE_FILES=ON cmake flags which enables pythonPackages.opencv3 to build.

@basvandijk
Copy link
Member Author

Ping

@orivej
Copy link
Contributor

orivej commented Nov 21, 2017

Some stuff was failing even after the latest update, I'll check what exactly.

@basvandijk
Copy link
Member Author

Thanks. It could be that my haskellPackages.opencv-extra also failed but I recently published a new version that should work with OpenCV-3.3.*. nixpkgs now has this latest version.

@FRidh
Copy link
Member

FRidh commented Nov 21, 2017 •
edited

Do we also know why it breaks with our protobuf and not the vendored version?

@basvandijk
Copy link
Member Author

@FRidh if we set -DBUILD_PROTOBUF=OFF and -DPROTOBUF_UPDATE_FILES=ON then pythonPackages.opencv3 fails to build with the error mentioned by @orivej above. That error seems to be a bug in opencv.

@FRidh
Copy link
Member

FRidh commented Nov 21, 2017

Is the issue known upstream?

@basvandijk
Copy link
Member Author

@FRidh it looks like opencv has many protobuf related issues. This one comes close: opencv/opencv#10021. I see work is being done to fix most of them, e.g.: opencv/opencv#9106 and opencv/opencv#10092. Hopefully the next release has sorted this all out.

@orivej orivej merged commit 8168433 into NixOS:master Nov 22, 2017
@orivej
Copy link
Contributor

orivej commented Nov 22, 2017

Thank you! I don't see build failures anymore.

@FRidh
Copy link
Member

FRidh commented Nov 22, 2017

@basvandijk thanks for including the references. We should be cautious not to just drop flags to make a build pass. E.g., will someone remember to add (or at least check with) the flags again with the next bump?

@basvandijk
Copy link
Member Author

@FRidh I agree in general. For the next release I will try to see if we can use NixOS's protobuf again and also if I can re-enable the currently broken: cnn_3dobj and dnn_modern modules.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/overrides-potentially-not-being-applied/8890/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orivej orivej orivej requested changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@basvandijk @FRidh @NeQuissimus @orivej @nixos-discourse @GrahamcOfBorg