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.

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

opencv: 3.2.0 -> 3.3.0 #30646

Merged
merged 1 commit into from Oct 24, 2017
Merged

opencv: 3.2.0 -> 3.3.0 #30646

merged 1 commit into from Oct 24, 2017

Conversation

basvandijk
Copy link
Member

It builds successfully on both x86_64-linux and x86_64-darwin.

See: https://opencv.org/opencv-3-3.html

@globin
Copy link
Member

globin commented Oct 21, 2017

Do we really need a bundled protobuf? We generally have the policy to not allow this.

@basvandijk
Copy link
Member Author

@globin I have a hunch that we can avoid the built-in protobuf if we configure opencv to statically link against ${pkgs.protobuf3_1}/lib/libprotobuf.a. My hunch is based on the same resolution of BVLC/caffe#1917 where they have the same issue.

I didn't know how to do that though so I went with the easier option of using the built-in protobuf.

@basvandijk
Copy link
Member Author

I made another attempt at fixing the protobuf issue but failed.

A quick way to reproduce the bug is to checkout that branch and run:

$ nix-build -A haskellPackages.opencv-extra
...
[libprotobuf ERROR google/protobuf/descriptor_database.cc:57] File already exists in database: caffe.proto
[libprotobuf FATAL google/protobuf/descriptor.cc:1272] CHECK failed: generated_database_->Add(encoded_file_descriptor, size): 
terminate called after throwing an instance of 'google::protobuf::FatalException'
  what():  CHECK failed: generated_database_->Add(encoded_file_descriptor, size): 

So for the time being I think it's best to go with this PR and use the bundled protobuf. We can always come up with a better fix later.

@globin
Copy link
Member

globin commented Oct 22, 2017

We had the same issue with mesos, check c2ce384

@basvandijk
Copy link
Member Author

This is the issue that we're running into: opencv/opencv_contrib#823

I tried the last suggestion in that issue which is to patch caffe to rename libproto.a -> libcaffeproto.a. Unfortunately that didn't help.

So for now I disabled the troublesome dnn_modern contrib module.

I will squash all commits into a single commit and do a force push.

@basvandijk basvandijk force-pushed the opencv-3.3.0 branch 2 times, most recently from 8adb5c2 to d64570f Compare October 23, 2017 22:49
@basvandijk
Copy link
Member Author

This is ready to be reviewed again.

Release notes: https://opencv.org/opencv-3-3.html

The contrib module cnn_3dobj is disabled because it fails to build.

The contrib module dnn_modern is disabled because it causes:
opencv/opencv_contrib#823
@globin globin merged commit 4663bfa into NixOS:master Oct 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants