Peter M. Groen / openbr

Commit 303a0d8a03f82c3cff4038bd27098e5a56ecb29b

Authored by Josh Klontz
1 parent 2f95b8ad

updated to latest janus

Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
1 -Subproject commit 9844d8a3a0a90344ad9382b9e99e51a913dfbcfb 1 +Subproject commit af63eb32f4bb271e78296b9740fb0d9f004b27e8
openbr/janus.cpp
  View file @303a0d8
@@ -17,6 +17,7 @@ janus_error janus_initialize(const char *sdk_path, const char *model_file) @@ -17,6 +17,7 @@ janus_error janus_initialize(const char *sdk_path, const char *model_file)
17 int argc = 1; 17 int argc = 1;
18 const char *argv[1] = { "janus" }; 18 const char *argv[1] = { "janus" };
19 Context::initialize(argc, (char**)argv, sdk_path, false); 19 Context::initialize(argc, (char**)argv, sdk_path, false);
  20 + Globals->quiet = true;
20 QString algorithm = model_file; 21 QString algorithm = model_file;
21 if (algorithm.isEmpty()) { 22 if (algorithm.isEmpty()) {
22 transform = Transform::fromAlgorithm("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", false); 23 transform = Transform::fromAlgorithm("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", false);
@@ -91,7 +92,7 @@ janus_error janus_finalize_template(janus_template template_, janus_flat_templat @@ -91,7 +92,7 @@ janus_error janus_finalize_template(janus_template template_, janus_flat_templat
91 return JANUS_SUCCESS; 92 return JANUS_SUCCESS;
92 } 93 }
93 94
94 -janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, const janus_flat_template b, const size_t b_bytes, double *similarity) 95 +janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, const janus_flat_template b, const size_t b_bytes, float *similarity)
95 { 96 {
96 *similarity = 0; 97 *similarity = 0;
97 98
@@ -120,7 +121,7 @@ janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, cons @@ -120,7 +121,7 @@ janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, cons
120 return JANUS_UNKNOWN_ERROR; 121 return JANUS_UNKNOWN_ERROR;
121 122
122 if (comparisons > 0) *similarity /= comparisons; 123 if (comparisons > 0) *similarity /= comparisons;
123 - else *similarity = -std::numeric_limits<double>::max(); 124 + else *similarity = -std::numeric_limits<float>::max();
124 return JANUS_SUCCESS; 125 return JANUS_SUCCESS;
125 } 126 }
126 127
@@ -137,13 +138,13 @@ janus_error janus_enroll(const janus_template template_, const janus_template_id @@ -137,13 +138,13 @@ janus_error janus_enroll(const janus_template template_, const janus_template_id
137 return JANUS_SUCCESS; 138 return JANUS_SUCCESS;
138 } 139 }
139 140
140 -janus_error janus_gallery_size(janus_gallery gallery, int *size) 141 +janus_error janus_gallery_size(janus_gallery gallery, size_t *size)
141 { 142 {
142 *size = TemplateList::fromGallery(gallery).size(); 143 *size = TemplateList::fromGallery(gallery).size();
143 return JANUS_SUCCESS; 144 return JANUS_SUCCESS;
144 } 145 }
145 146
146 -janus_error janus_compare(janus_gallery target, janus_gallery query, double *similarity_matrix, janus_template_id *target_ids, janus_template_id *query_ids) 147 +janus_error janus_compare(janus_gallery target, janus_gallery query, float *similarity_matrix, janus_template_id *target_ids, janus_template_id *query_ids)
147 { 148 {
148 const TemplateList targets = TemplateList::fromGallery(target); 149 const TemplateList targets = TemplateList::fromGallery(target);
149 const TemplateList queries = TemplateList::fromGallery(query); 150 const TemplateList queries = TemplateList::fromGallery(query);
@@ -151,7 +152,7 @@ janus_error janus_compare(janus_gallery target, janus_gallery query, double *sim @@ -151,7 +152,7 @@ janus_error janus_compare(janus_gallery target, janus_gallery query, double *sim
151 distance->compare(targets, queries, matrix.data()); 152 distance->compare(targets, queries, matrix.data());
152 const QVector<janus_template_id> targetIds = File::get<janus_template_id,File>(matrix->targetFiles, "TEMPLATE_ID").toVector(); 153 const QVector<janus_template_id> targetIds = File::get<janus_template_id,File>(matrix->targetFiles, "TEMPLATE_ID").toVector();
153 const QVector<janus_template_id> queryIds = File::get<janus_template_id,File>(matrix->queryFiles, "TEMPLATE_ID").toVector(); 154 const QVector<janus_template_id> queryIds = File::get<janus_template_id,File>(matrix->queryFiles, "TEMPLATE_ID").toVector();
154 - memcpy(similarity_matrix, matrix->data.data, matrix->data.rows * matrix->data.cols * sizeof(double)); 155 + memcpy(similarity_matrix, matrix->data.data, matrix->data.rows * matrix->data.cols * sizeof(float));
155 memcpy(target_ids, targetIds.data(), targetIds.size() * sizeof(janus_template_id)); 156 memcpy(target_ids, targetIds.data(), targetIds.size() * sizeof(janus_template_id));
156 memcpy(query_ids, queryIds.data(), queryIds.size() * sizeof(janus_template_id)); 157 memcpy(query_ids, queryIds.data(), queryIds.size() * sizeof(janus_template_id));
157 return JANUS_SUCCESS; 158 return JANUS_SUCCESS;