Merge branch 'master' of github.com:seetaface/SeetaFaceEngine

Author: jiezhang-zz

FaceDetection/.gitignore

@@ -0,0 +1 @@
+build/

FaceDetection/CMakeLists.txt

@@ -0,0 +1,67 @@
+cmake_minimum_required(VERSION 3.1.0)
+
+project(seeta_facedet_lib)
+
+# Build options
+option(BUILD_EXAMPLES  "Set to ON to build examples"  ON)
+option(USE_OPENMP      "Set to ON to build use openmp"  ON)
+option(USE_SSE         "Set to ON to build use SSE"  ON)
+
+# Use C++11
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+message(STATUS "C++11 support has been enabled by default.")
+
+# Use SSE
+if (USE_SSE)
+    add_definitions(-DUSE_SSE)
+    message(STATUS "Use SSE")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
+endif()
+
+# Use OpenMP
+if (USE_OPENMP)
+    find_package(OpenMP QUIET)
+    if (OPENMP_FOUND)
+        message(STATUS "Use OpenMP")
+        add_definitions(-DUSE_OPENMP)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+    endif()
+endif()
+
+include_directories(include)
+
+set(src_files 
+    src/util/nms.cpp
+    src/util/image_pyramid.cpp
+    src/io/lab_boost_model_reader.cpp
+    src/io/surf_mlp_model_reader.cpp
+    src/feat/lab_feature_map.cpp
+    src/feat/surf_feature_map.cpp
+    src/classifier/lab_boosted_classifier.cpp
+    src/classifier/mlp.cpp
+    src/classifier/surf_mlp.cpp
+    src/face_detection.cpp
+    src/fust.cpp
+    )
+
+# Build shared library
+add_library(seeta_facedet_lib SHARED ${src_files})
+set(facedet_required_libs seeta_facedet_lib)
+
+# Build examples
+if (BUILD_EXAMPLES)
+    message(STATUS "Build with examples.")
+    find_package(OpenCV)
+    if (NOT OpenCV_FOUND)
+        message(WARNING "OpenCV not found. Test will not be built.")
+    else()
+        include_directories(${OpenCV_INCLUDE_DIRS})
+        list(APPEND facedet_required_libs ${OpenCV_LIBS})
+        
+        add_executable(facedet_test src/test/facedetection_test.cpp)
+        target_link_libraries(facedet_test ${facedet_required_libs})
+    endif()
+endif()

FaceDetection/README.md

@@ -58,6 +58,20 @@ FacenessNet [2] | 80x80 | n/a | 20 FPS
 7. *(Optional) Enable OpenMP support: (Project) Properities -> Configuration Properties -> C/C++ -> Language -> Open MP Support (or ... C/C++ -> Language [Intel C++] -> OpenMP Support). Define `USE_OPENMP` macro if necessary.*
 8. Build.
 
+### How to Build in Linux
+- Build
+```shell
+mkdir build
+cd build
+cmake ..
+make -j${nproc}
+```
+
+- Run demo
+```shell
+./build/facedet_test image_file model/seeta_fd_frontal_v1.0.bin
+```
+
 ### How to run SeetaFace Detector
 
 The class for face detection is included in `seeta` namespace. To detect faces on an image, one should first
@@ -110,4 +124,4 @@ If you find SeetaFace Detection (FuSt) useful in your research work, please cons
 
 ### License
 
-SeetaFace Detection is released under the [BSD 2-Clause license](../LICENSE).
+SeetaFace Detection is released under the [BSD 2-Clause license](../LICENSE).

FaceDetection/include/common.h

@@ -34,12 +34,17 @@
 
 #include <cstdint>
 
+#if defined _WIN32
 #ifdef SEETA_EXPORTS
 #define SEETA_API __declspec(dllexport)
 #else
 #define SEETA_API __declspec(dllimport)
 #endif
 
+#else
+#define SEETA_API
+#endif
+
 #define DISABLE_COPY_AND_ASSIGN(classname) \
  private: \
   classname(const classname&); \

FaceDetection/include/feat/surf_feature_map.h

@@ -33,6 +33,7 @@
 #define SEETA_FD_FEAT_SURF_FEATURE_MAP_H_
 
 #include <cstdint>
+#include <cstring>
 #include <vector>
 
 #include "common.h"

FaceDetection/include/util/image_pyramid.h

@@ -34,6 +34,7 @@
 
 #include <cstdint>
 #include <string>
+#include <cstring>
 
 #include "common.h"
 

FaceDetection/include/util/math_func.h

@@ -32,7 +32,9 @@
 #ifndef SEETA_FD_UTIL_MATH_FUNC_H_
 #define SEETA_FD_UTIL_MATH_FUNC_H_
 
+#ifdef USE_SSE
 #include <immintrin.h>
+#endif
 
 #include <cstdint>
 
@@ -49,31 +51,37 @@ class MathFunction {
 
   static inline void VectorAdd(const int32_t* x, const int32_t* y, int32_t* z,
       int32_t len) {
+    int32_t i;
+#ifdef USE_SSE
     __m128i x1;
     __m128i y1;
     const __m128i* x2 = reinterpret_cast<const __m128i*>(x);
     const __m128i* y2 = reinterpret_cast<const __m128i*>(y);
     __m128i* z2 = reinterpret_cast<__m128i*>(z);
 
-    int32_t i;
     for (i = 0; i < len - 4; i += 4) {
       x1 = _mm_loadu_si128(x2++);
       y1 = _mm_loadu_si128(y2++);
       _mm_storeu_si128(z2++, _mm_add_epi32(x1, y1));
     }
     for (; i < len; i++)
       *(z + i) = (*(x + i)) + (*(y + i));
+#else
+    for (i = 0; i < len; i++)
+      *(z + i) = (*(x + i)) + (*(y + i));
+#endif
   }
 
   static inline void VectorSub(const int32_t* x, const int32_t* y, int32_t* z,
       int32_t len) {
+    int32_t i;
+#ifdef USE_SSE
     __m128i x1;
     __m128i y1;
     const __m128i* x2 = reinterpret_cast<const __m128i*>(x);
     const __m128i* y2 = reinterpret_cast<const __m128i*>(y);
     __m128i* z2 = reinterpret_cast<__m128i*>(z);
 
-    int32_t i;
     for (i = 0; i < len - 4; i += 4) {
       x1 = _mm_loadu_si128(x2++);
       y1 = _mm_loadu_si128(y2++);
@@ -82,47 +90,62 @@ class MathFunction {
     }
     for (; i < len; i++)
       *(z + i) = (*(x + i)) - (*(y + i));
+#else
+    for (i = 0; i < len; i++)
+      *(z + i) = (*(x + i)) - (*(y + i));
+#endif
   }
 
   static inline void VectorAbs(const int32_t* src, int32_t* dest, int32_t len) {
+    int32_t i;
+#ifdef USE_SSE
     __m128i val;
     __m128i val_abs;
     const __m128i* x = reinterpret_cast<const __m128i*>(src);
     __m128i* y = reinterpret_cast<__m128i*>(dest);
 
-    int32_t i;
     for (i = 0; i < len - 4; i += 4) {
       val = _mm_loadu_si128(x++);
       val_abs = _mm_abs_epi32(val);
       _mm_storeu_si128(y++, val_abs);
     }
     for (; i < len; i++)
       dest[i] = (src[i] >= 0 ? src[i] : -src[i]);
+#else
+    for (i = 0; i < len; i++)
+      dest[i] = (src[i] >= 0 ? src[i] : -src[i]);
+#endif
   }
 
   static inline void Square(const int32_t* src, uint32_t* dest, int32_t len) {
+    int32_t i;
+#ifdef USE_SSE
     __m128i x1;
     const __m128i* x2 = reinterpret_cast<const __m128i*>(src);
     __m128i* y2 = reinterpret_cast<__m128i*>(dest);
 
-    int32_t i;
     for (i = 0; i < len - 4; i += 4) {
       x1 = _mm_loadu_si128(x2++);
       _mm_storeu_si128(y2++, _mm_mullo_epi32(x1, x1));
     }
     for (; i < len; i++)
       *(dest + i) = (*(src + i)) * (*(src + i));
+#else
+    for (i = 0; i < len; i++)
+      *(dest + i) = (*(src + i)) * (*(src + i));
+#endif
   }
 
   static inline float VectorInnerProduct(const float* x, const float* y,
       int32_t len) {
+    float prod = 0;
+    int32_t i;
+#ifdef USE_SSE
     __m128 x1;
     __m128 y1;
     __m128 z1 = _mm_setzero_ps();
-    float prod;
     float buf[4];
 
-    int32_t i;
     for (i = 0; i < len - 4; i += 4) {
       x1 = _mm_loadu_ps(x + i);
       y1 = _mm_loadu_ps(y + i);
@@ -132,7 +155,10 @@ class MathFunction {
     prod = buf[0] + buf[1] + buf[2] + buf[3];
     for (; i < len; i++)
       prod += x[i] * y[i];
-
+#else
+    for (i = 0; i < len; i++)
+        prod += x[i] * y[i];
+#endif
     return prod;
   }
 };

FaceDetection/src/feat/surf_feature_map.cpp

@@ -29,6 +29,7 @@
  *
  */
 
+#include <cmath>
 #include "feat/surf_feature_map.h"
 
 namespace seeta {
@@ -222,6 +223,8 @@ void SURFFeatureMap::ComputeIntegralImages() {
 void SURFFeatureMap::MaskIntegralChannel() {
   const int32_t* grad_x = grad_x_.data();
   const int32_t* grad_y = grad_y_.data();
+  int32_t len = width_ * height_;
+#ifdef USE_SSE
   __m128i dx;
   __m128i dy;
   __m128i dx_mask;
@@ -231,7 +234,6 @@ void SURFFeatureMap::MaskIntegralChannel() {
   __m128i data;
   __m128i result;
   __m128i* src = reinterpret_cast<__m128i*>(int_img_.data());
-  int32_t len = width_ * height_;
 
   for (int32_t i = 0; i < len; i++) {
     dx = _mm_set1_epi32(*(grad_x++));
@@ -246,6 +248,32 @@ void SURFFeatureMap::MaskIntegralChannel() {
     result = _mm_and_si128(data, dx_mask);
     _mm_storeu_si128(src++, result);
   }
+#else
+  int32_t dx, dy, dx_mask, dy_mask, cmp;
+  int32_t xor_bits[] = {-1, -1, 0, 0};
+
+  int32_t* src = int_img_.data();
+  for (int32_t i = 0; i < len; i++) {
+      dy = *(grad_y++);
+      dx = *(grad_x++);
+      
+      cmp = dy < 0 ? 0xffffffff : 0x0;
+      for (int32_t j = 0; j < 4; j++) {
+          // cmp xor xor_bits
+          dy_mask = cmp ^ xor_bits[j];
+          *(src) = (*src) & dy_mask;
+          src++;
+      }
+      
+      cmp = dx < 0 ? 0xffffffff : 0x0;
+      for (int32_t j = 0; j < 4; j++) {
+          // cmp xor xor_bits
+          dx_mask = cmp ^ xor_bits[j];
+          *(src) = (*src) & dx_mask;
+          src++;
+      }
+  }
+#endif
 }
 
 void SURFFeatureMap::Integral() {
@@ -265,6 +293,7 @@ void SURFFeatureMap::Integral() {
 
 void SURFFeatureMap::VectorCumAdd(int32_t* x, int32_t len,
     int32_t num_channel) {
+#ifdef USE_SSE
   __m128i x1;
   __m128i y1;
   __m128i z1;
@@ -288,6 +317,14 @@ void SURFFeatureMap::VectorCumAdd(int32_t* x, int32_t len,
     _mm_storeu_si128(z2, z1);
     z2 = y2;
   }
+#else
+  int32_t cols = len / num_channel - 1;
+  for (int32_t i = 0; i < cols; i++) {
+    int32_t* col1 = x + i * num_channel;
+    int32_t* col2 = col1 + num_channel;
+    seeta::fd::MathFunction::VectorAdd(col1, col2, col2, num_channel);
+  }
+#endif
 }
 
 void SURFFeatureMap::ComputeFeatureVector(const SURFFeature & feat,

FaceDetection/src/test/facedetection_test.cpp

@@ -39,9 +39,18 @@
 
 #include "face_detection.h"
 
+using namespace std;
+
 int main(int argc, char** argv) {
-  const char* img_path = "test_image.jpg";
-  seeta::FaceDetection detector("seeta_fd_frontal_v1.0.bin");
+  if (argc < 3) {
+      cout << "Usage: " << argv[0]
+          << " image_path model_path"
+          << endl;
+      return -1;
+  }
+
+  const char* img_path = argv[1];
+  seeta::FaceDetection detector(argv[2]);
 
   detector.SetMinFaceSize(40);
   detector.SetScoreThresh(2.f);
@@ -62,7 +71,26 @@ int main(int argc, char** argv) {
   img_data.height = img_gray.rows;
   img_data.num_channels = 1;
 
+  long t0 = cv::getTickCount();
   std::vector<seeta::FaceInfo> faces = detector.Detect(img_data);
+  long t1 = cv::getTickCount();
+  double secs = (t1 - t0)/cv::getTickFrequency();
+
+  cout << "Detections takes " << secs << " seconds " << endl;
+#ifdef USE_OPENMP
+  cout << "OpenMP is used." << endl;
+#else
+  cout << "OpenMP is not used. " << endl;
+#endif
+
+#ifdef USE_SSE
+  cout << "SSE is used." << endl;
+#else
+  cout << "SSE is not used." << endl;
+#endif
+
+  cout << "Image size (wxh): " << img_data.width << "x" 
+      << img_data.height << endl;
 
   cv::Rect face_rect;
   int32_t num_face = static_cast<int32_t>(faces.size());

FaceIdentification/src/blob.cpp

@@ -126,7 +126,7 @@ void Blob::Permute(int dim1, int dim2, int dim3, int dim4) {
   for (int i = 0; i < 4; ++ i)
     shape_[i] = tmp_shape[i];
   memcpy(dat, tmp, sizeof(float) * count_);
-  delete tmp;
+  delete[] tmp;
 }
 
 void Blob::Release() {