OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made it so you can call the std::vector<detectors> version of the 

object_detector constructor from python.  So now you can pack multiple
detectors into one object via the python API.
This commit is contained in:
Davis King 2018-06-17 23:17:36 -04:00
parent d50d8e0268
commit d3006ab3b9
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/python/src/object_detection.cpp
View File

@ -123,6 +123,23 @@ inline void find_candidate_object_locations_py (
// ----------------------------------------------------------------------------------------
std::shared_ptr<simple_object_detector_py> merge_simple_object_detectors (
const py::list& detectors
)
{
DLIB_CASSERT(len(detectors) > 0);
std::vector<simple_object_detector> temp;
for (auto& d : detectors)
temp.push_back(d.cast<simple_object_detector_py>().detector);
simple_object_detector_py result;
result.detector = simple_object_detector(temp);
result.upsampling_amount = detectors[0].cast<simple_object_detector_py>().upsampling_amount;
return std::make_shared<simple_object_detector_py>(result);
}
// ----------------------------------------------------------------------------------------
void bind_object_detection(py::module& m)
{
{
@ -385,6 +402,20 @@ ensures \n\
typedef simple_object_detector_py type;
py::class_<type, std::shared_ptr<type>>(m, "simple_object_detector",
"This object represents a sliding window histogram-of-oriented-gradients based object detector.")
.def(py::init(&merge_simple_object_detectors), py::arg("detectors"),
"This version of the constructor builds a simple_object_detector from a \n\
bunch of other simple_object_detectors. It essentially packs them together \n\
so that when you run the detector it's like calling run_multiple(). Except \n\
in this case the non-max suppression is applied to them all as a group. So \n\
unlike run_multiple(), each detector competes in the non-max suppression."
/*!
This version of the constructor builds a simple_object_detector from a
bunch of other simple_object_detectors. It essentially packs them together
so that when you run the detector it's like calling run_multiple(). Except
in this case the non-max suppression is applied to them all as a group. So
unlike run_multiple(), each detector competes in the non-max suppression.
!*/
)
.def(py::init(&load_object_from_file<type>),
"Loads a simple_object_detector from a file that contains the output of the \n\
train_simple_object_detector() routine.")