kotovalexarian-likes-github/ruby-opencv
1
0
Fork 0
mirror of https://github.com/ruby-opencv/ruby-opencv synced 2023-03-27 23:22:12 -04:00
Code Releases Activity

Some more code cleanup and return of read_net_… methods.

Browse source
This commit is contained in:
Francois Deschenes 2018-07-26 21:19:09 -07:00
parent 801d1e8694
commit 869e21ab42
5 changed files with 109 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

100
ext/opencv/dnn.cpp
View file

@ -8,9 +8,6 @@
#include "dnn_layer.hpp" #include "dnn_layer.hpp"
#include "error.hpp" #include "error.hpp"
// https://docs.opencv.org/trunk/d6/d0f/group__dnn.html#ga29d0ea5e52b1d1a6c2681e3f7d68473a
// https://github.com/opencv/opencv/blob/master/modules/dnn/src/caffe/caffe_importer.cpp
namespace rubyopencv { namespace rubyopencv {
namespace Dnn { namespace Dnn {
VALUE rb_module = Qnil; VALUE rb_module = Qnil;
@ -21,23 +18,22 @@ namespace rubyopencv {
rb_scan_args(argc, argv, "11", &image, &options); rb_scan_args(argc, argv, "11", &image, &options);
cv::Mat *b = NULL; cv::Mat *b = NULL;
cv::Mat *m = Mat::obj2mat(image);
try { try {
cv::Mat r; double scale_factor = 1.0;
if (NIL_P(options)) {
r = cv::dnn::blobFromImage(*m);
} else {
Check_Type(options, T_HASH);
double scale_factor = NUM2DBL_DEFAULT(HASH_LOOKUP(options, "scale_factor"), 1.0);
cv::Size size; cv::Size size;
cv::Scalar mean; cv::Scalar mean;
bool swap_rb = RTEST_DEFAULT(HASH_LOOKUP(options, "swap_rb"), true); bool swap_rb = true;
bool crop = RTEST_DEFAULT(HASH_LOOKUP(options, "crop"), true); bool crop = true;
VALUE tmp = Qnil;
if (!NIL_P(options)) {
Check_Type(options, T_HASH);
scale_factor = NUM2DBL_DEFAULT(HASH_LOOKUP(options, "scale_factor"), scale_factor);
swap_rb = RTEST_DEFAULT(HASH_LOOKUP(options, "swap_rb"), (bool)swap_rb);
crop = RTEST_DEFAULT(HASH_LOOKUP(options, "crop"), (bool)crop);
VALUE tmp = Qnil;
tmp = HASH_LOOKUP(options, "size"); tmp = HASH_LOOKUP(options, "size");
if (!NIL_P(tmp)) { if (!NIL_P(tmp)) {
size = *(Size::obj2size(tmp)); size = *(Size::obj2size(tmp));
@ -47,11 +43,9 @@ namespace rubyopencv {
if (!NIL_P(tmp)) { if (!NIL_P(tmp)) {
mean = *(Scalar::obj2scalar(tmp)); mean = *(Scalar::obj2scalar(tmp));
} }
r = cv::dnn::blobFromImage(*m, scale_factor, size, mean, swap_rb, crop);
} }
b = new cv::Mat(r); b = new cv::Mat(cv::dnn::blobFromImage(*Mat::obj2mat(image), scale_factor, size, mean, swap_rb, crop));
} catch(cv::Exception& e) { } catch(cv::Exception& e) {
delete b; delete b;
Error::raise(e); Error::raise(e);
@ -60,72 +54,16 @@ namespace rubyopencv {
return Mat::mat2obj(b); return Mat::mat2obj(b);
} }
// // Net readNetFromCaffe(const String &prototxt, const String &caffeModel = String()); void init(VALUE opencv) {
// VALUE rb_read_net_from_caffe(VALUE self, VALUE prototxt, VALUE caffe_model) {
// cv::dnn::Net *net = NULL;
//
// try {
// net = new cv::dnn::Net(cv::dnn::readNetFromCaffe(StringValueCStr(prototxt), StringValueCStr(caffe_model)));
// } catch(cv::Exception& e) {
// delete net;
// Error::raise(e);
// }
//
// return Dnn::Net::net2obj(net);
// }
//
// // Net readNetFromTorch(const String &model, bool isBinary)
// VALUE rb_read_net_from_tensorflow(VALUE self, VALUE model) {
// cv::dnn::Net *net = NULL;
//
// try {
// net = new cv::dnn::Net(cv::dnn::readNetFromTensorflow(StringValueCStr(model)));
// } catch(cv::Exception& e) {
// delete net;
// Error::raise(e);
// }
//
// return Dnn::Net::net2obj(net);
// }
//
// // Net readNetFromTorch(const String &model, bool isBinary)
// VALUE rb_read_net_from_torch(VALUE self, VALUE model) {
// cv::dnn::Net *net = NULL;
//
// try {
// net = new cv::dnn::Net(cv::dnn::readNetFromTorch(StringValueCStr(model)));
// } catch(cv::Exception& e) {
// delete net;
// Error::raise(e);
// }
//
// return Dnn::Net::net2obj(net);
// }
//
// // Net readNetFromDarknet(const String &cfgFile, const String &darknetModel /*= String()*/)
// VALUE rb_read_net_from_darknet(VALUE self, VALUE cfg_file, VALUE darknet_model) {
// cv::dnn::Net *net = NULL;
//
// try {
// net = new cv::dnn::Net(cv::dnn::readNetFromDarknet(StringValueCStr(cfg_file), StringValueCStr(darknet_model)));
// } catch(cv::Exception& e) {
// delete net;
// Error::raise(e);
// }
//
// return Dnn::Net::net2obj(net);
// }
void init() {
VALUE opencv = rb_define_module("Cv");
rb_module = rb_define_module_under(opencv, "Dnn"); rb_module = rb_define_module_under(opencv, "Dnn");
rb_define_singleton_method(rb_module, "blob_from_image", RUBY_METHOD_FUNC(rb_blob_from_image), -1); rb_define_singleton_method(rb_module, "blob_from_image", RUBY_METHOD_FUNC(rb_blob_from_image), -1);
// rb_define_singleton_method(rb_module, "read_net_from_caffe", RUBY_METHOD_FUNC(rb_read_net_from_caffe), 2);
// rb_define_singleton_method(rb_module, "read_net_from_tensorflow", RUBY_METHOD_FUNC(rb_read_net_from_tensorflow), 1); rb_define_singleton_method(rb_module, "read_net", RUBY_METHOD_FUNC(Dnn::Net::rb_read_net), -1);
// rb_define_singleton_method(rb_module, "read_net_from_torch", RUBY_METHOD_FUNC(rb_read_net_from_torch), 1); rb_define_singleton_method(rb_module, "read_net_from_caffe", RUBY_METHOD_FUNC(Dnn::Net::rb_read_net_from_caffe), 2);
// rb_define_singleton_method(rb_module, "read_net_from_darknet", RUBY_METHOD_FUNC(rb_read_net_from_darknet), 2); rb_define_singleton_method(rb_module, "read_net_from_tensorflow", RUBY_METHOD_FUNC(Dnn::Net::rb_read_net_from_tensorflow), 1);
rb_define_singleton_method(rb_module, "read_net_from_torch", RUBY_METHOD_FUNC(Dnn::Net::rb_read_net_from_torch), 1);
rb_define_singleton_method(rb_module, "read_net_from_darknet", RUBY_METHOD_FUNC(Dnn::Net::rb_read_net_from_darknet), 2);
Dnn::Net::init(rb_module); Dnn::Net::init(rb_module);
Dnn::Layer::init(rb_module); Dnn::Layer::init(rb_module);

2
ext/opencv/dnn.hpp
View file

@ -6,7 +6,7 @@
*/ */
namespace rubyopencv { namespace rubyopencv {
namespace Dnn { namespace Dnn {
void init(); void init(VALUE opencv);
} }
} }

97
ext/opencv/dnn_net.cpp
View file

@ -37,41 +37,48 @@ namespace rubyopencv {
return TypedData_Wrap_Struct(klass, &opencv_net_type, ptr); return TypedData_Wrap_Struct(klass, &opencv_net_type, ptr);
} }
VALUE rb_initialize(int argc, VALUE *argv, VALUE self) { cv::dnn::Net* rb_read_net_internal(VALUE model, VALUE config, VALUE framework) {
VALUE model, config, framework;
rb_scan_args(argc, argv, "03", &model, &config, &framework);
if (!NIL_P(model)) {
cv::dnn::Net* dataptr = NULL; cv::dnn::Net* dataptr = NULL;
try { try {
cv::dnn::Net net = cv::dnn::readNet(StringValueCStr(model), CSTR_DEFAULT(config, ""), CSTR_DEFAULT(framework, "")); cv::dnn::Net net = cv::dnn::readNet(StringValueCStr(model), CSTR_DEFAULT(config, ""), CSTR_DEFAULT(framework, ""));
cv::dnn::Net* dataptr = new cv::dnn::Net(net); dataptr = new cv::dnn::Net(net);
RTYPEDDATA_DATA(self) = dataptr;
} catch(cv::Exception& e) { } catch(cv::Exception& e) {
delete dataptr; delete dataptr;
Error::raise(e); Error::raise(e);
} }
return dataptr;
}
VALUE rb_initialize(int argc, VALUE *argv, VALUE self) {
VALUE model, config, framework;
rb_scan_args(argc, argv, "03", &model, &config, &framework);
if (argc > 0) {
RTYPEDDATA_DATA(self) = rb_read_net_internal(model, config, framework);
} }
return self; return self;
} }
VALUE rb_read_net(int argc, VALUE *argv, VALUE self) {
VALUE model, config, framework;
rb_scan_args(argc, argv, "12", &model, &config, &framework);
return net2obj(rb_read_net_internal(model, config, framework));
}
// void setInput(const Mat &blob, const String& name = "") // void setInput(const Mat &blob, const String& name = "")
VALUE rb_set_input(int argc, VALUE *argv, VALUE self) { VALUE rb_set_input(int argc, VALUE *argv, VALUE self) {
VALUE blob, name; VALUE blob, name, options;
rb_scan_args(argc, argv, "11", &blob, &name); rb_scan_args(argc, argv, "12", &blob, &name, &options);
cv::dnn::Net* selfptr = obj2net(self); cv::dnn::Net* selfptr = obj2net(self);
cv::Mat *m = Mat::obj2mat(blob); cv::Mat *m = Mat::obj2mat(blob);
try { try {
if (NIL_P(name)) { selfptr->setInput(*m, CSTR_DEFAULT(name, ""));
selfptr->setInput(*m);
} else {
selfptr->setInput(*m, StringValueCStr(name));
}
} catch(cv::Exception& e) { } catch(cv::Exception& e) {
delete m; delete m;
Error::raise(e); Error::raise(e);
@ -107,12 +114,12 @@ namespace rubyopencv {
VALUE rb_get_layers(VALUE self) { VALUE rb_get_layers(VALUE self) {
cv::dnn::Net* selfptr = obj2net(self); cv::dnn::Net* selfptr = obj2net(self);
std::vector<cv::String> v = selfptr->getLayerNames(); std::vector<cv::String> layer_names = selfptr->getLayerNames();
const long size = v.size(); const long size = layer_names.size();
VALUE layers = rb_ary_new_capa(size); VALUE layers = rb_ary_new_capa(size);
for (long i = 0; i < size; i++) { for (long i = 0; i < size; i++) {
VALUE layer = Dnn::Layer::layer2obj(selfptr->getLayer(v[i])); VALUE layer = Dnn::Layer::layer2obj(selfptr->getLayer(layer_names[i]));
rb_ary_store(layers, i, layer); rb_ary_store(layers, i, layer);
} }
@ -137,6 +144,62 @@ namespace rubyopencv {
return self; return self;
} }
// Net readNetFromCaffe(const String &prototxt, const String &caffeModel = String());
VALUE rb_read_net_from_caffe(VALUE self, VALUE prototxt, VALUE caffe_model) {
cv::dnn::Net *net = NULL;
try {
net = new cv::dnn::Net(cv::dnn::readNetFromCaffe(StringValueCStr(prototxt), StringValueCStr(caffe_model)));
} catch(cv::Exception& e) {
delete net;
Error::raise(e);
}
return net2obj(net);
}
// Net readNetFromTorch(const String &model, bool isBinary)
VALUE rb_read_net_from_tensorflow(VALUE self, VALUE model) {
cv::dnn::Net *net = NULL;
try {
net = new cv::dnn::Net(cv::dnn::readNetFromTensorflow(StringValueCStr(model)));
} catch(cv::Exception& e) {
delete net;
Error::raise(e);
}
return net2obj(net);
}
// Net readNetFromTorch(const String &model, bool isBinary)
VALUE rb_read_net_from_torch(VALUE self, VALUE model) {
cv::dnn::Net *net = NULL;
try {
net = new cv::dnn::Net(cv::dnn::readNetFromTorch(StringValueCStr(model)));
} catch(cv::Exception& e) {
delete net;
Error::raise(e);
}
return net2obj(net);
}
// Net readNetFromDarknet(const String &cfgFile, const String &darknetModel /*= String()*/)
VALUE rb_read_net_from_darknet(VALUE self, VALUE cfg_file, VALUE darknet_model) {
cv::dnn::Net *net = NULL;
try {
net = new cv::dnn::Net(cv::dnn::readNetFromDarknet(StringValueCStr(cfg_file), StringValueCStr(darknet_model)));
} catch(cv::Exception& e) {
delete net;
Error::raise(e);
}
return net2obj(net);
}
void init(VALUE rb_module) { void init(VALUE rb_module) {
rb_klass = rb_define_class_under(rb_module, "Net", rb_cData); rb_klass = rb_define_class_under(rb_module, "Net", rb_cData);
rb_define_alloc_func(rb_klass, rb_allocate); rb_define_alloc_func(rb_klass, rb_allocate);

5
ext/opencv/dnn_net.hpp
View file

@ -9,6 +9,11 @@ namespace rubyopencv {
namespace Net { namespace Net {
void init(VALUE rb_module); void init(VALUE rb_module);
VALUE net2obj(cv::dnn::Net* ptr); VALUE net2obj(cv::dnn::Net* ptr);
VALUE rb_read_net(int argc, VALUE *argv, VALUE self);
VALUE rb_read_net_from_caffe(VALUE self, VALUE prototxt, VALUE caffe_model);
VALUE rb_read_net_from_tensorflow(VALUE self, VALUE model);
VALUE rb_read_net_from_torch(VALUE self, VALUE model);
VALUE rb_read_net_from_darknet(VALUE self, VALUE cfg_file, VALUE darknet_model);
} }
} }
} }

2
ext/opencv/opencv.cpp
View file

@ -93,7 +93,7 @@ namespace rubyopencv {
Size::init(); Size::init();
Scalar::init(); Scalar::init();
CascadeClassifier::init(); CascadeClassifier::init();
Dnn::init(); Dnn::init(rb_module);
VideoCapture::init(); VideoCapture::init();
Window::init(); Window::init();
Trackbar::init(); Trackbar::init();