EyepadAlign for aligning face images across different datasets

.appveyor.yml

@@ -18,6 +18,7 @@ install:
   - pip install nose-exclude
   - pip install dlib
   - pip install imageio
+  - pip install scikit-image
 
 test_script:
   - nosetests -s -v --exclude-dir=mlxtend/plotting

.travis.yml

@@ -1,20 +1,48 @@
-sudo: required
-language: python
+language: generic
+
+cache:
+  apt: true
+  directories:
+  - $HOME/.cache/pip
+  - $HOME/.ccache
+
+dist: trusty
+
+env:
+  global:
+    # Directory where tests are run from
+    - TEST_DIR=/tmp/sklearn
+    - OMP_NUM_THREADS=4
+    - OPENBLAS_NUM_THREADS=4
+
 matrix:
     include:
-        - python: 3.6
+        - os: linux
+          sudo: required
+          python: 3.6
           env: LATEST="false" IMAGE="true" COVERAGE="false" NUMPY_VERSION="1.14.6" SCIPY_VERSION="1.1.0" SKLEARN_VERSION="0.20.1" PANDAS_VERSION="0.23.4"  MINICONDA_PYTHON_VERSION=3.7
-        - python: 3.6 # python 3.7
+        - os: linux
+          python: 3.6
           env: LATEST="true" IMAGE="true" COVERAGE="true" NOTEBOOKS="true" MINICONDA_PYTHON_VERSION=3.7
-        - python: 3.6 # python 3.7
+        - os: linux
+          sudo: required
+          python: 3.6
           env: LATEST="true" IMAGE="false" COVERAGE="false" NOTEBOOKS="false" MINICONDA_PYTHON_VERSION=3.7
+
+
+before_install:
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+
 install:
-    - sudo apt-get update
+    - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo apt-get update; fi
     - source ci/.travis_install.sh
+
 script:
     - bash ci/.travis_test.sh
+
 after_success:
     - if [[ "$COVERAGE" == "true" ]]; then coveralls || echo "failed"; fi
+
 notifications:
     email:
       recipients:

ci/.travis_install.sh

@@ -2,11 +2,22 @@
 
 set -e
 
-if [ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]; then
-    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then 
+    if [ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]; then
+
+        wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+    else
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+    fi
 else
-    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+    if [ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]; then
+
+        wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh
+    else
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
+    fi
 fi
+
 
 bash miniconda.sh -b -p $HOME/miniconda
 export PATH="$HOME/miniconda/bin:$PATH"
@@ -32,6 +43,7 @@ conda install jupyter
 if [ "${IMAGE}" = "true" ]; then
     pip install dlib
     pip install imageio
+    pip install scikit-image
 fi
 
 if [ "${COVERAGE}" = "true" ]; then

ci/.travis_test.sh

@@ -3,22 +3,29 @@
 set -e
 
 
-if [[ "$COVERAGE" == "true" ]]; then
+if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then 
 
-    if [[ "$IMAGE" == "true" ]]; then
-        nosetests -s -v --with-coverage
-    else
-        nosetests -s -v --with-coverage --exclude-dir=mlxtend/image
-    fi
+
+        if [[ "$COVERAGE" == "true" ]]; then
+
+            if [[ "$IMAGE" == "true" ]]; then
+                nosetests -s -v --with-coverage
+            else
+                nosetests -s -v --with-coverage --exclude-dir=mlxtend/image
+            fi
+
+        else
+            if [[ "$IMAGE" == "true" ]]; then
+                nosetests -s -v
+            else
+                nosetests -s -v --exclude-dir=mlxtend/image
+            fi
+        fi
 
 else
-    if [[ "$IMAGE" == "true" ]]; then
-        nosetests -s -v
-    else
-        nosetests -s -v --exclude-dir=mlxtend/image
-    fi
+    nosetests -s -v --exclude-dir=mlxtend/plotting
 fi
-
+  
 
 if [[ "$NOTEBOOKS" == "true" ]]; then
     cd docs

docs/mkdocs.yml

@@ -98,6 +98,7 @@ nav:
     - user_guide/general_concepts/regularization-linear.md
   - image:
     - user_guide/image/extract_face_landmarks.md
+    - user_guide/image/eyepad_align.md
   - math:
     - user_guide/math/num_combinations.md
     - user_guide/math/num_permutations.md

docs/sources/CHANGELOG.md

@@ -16,12 +16,14 @@ The CHANGELOG for the current development version is available at
 
 ##### New Features
 
+- Adds a new transformer class to `mlxtend.image`, `EyepadAlign`, that aligns face images based on the location of the eyes. ([#466](https://github.com/rasbt/mlxtend/pull/466) by [Vahid Mirjalili](https://github.com/vmirly))
 - Adds a new function, `mlxtend.evaluate.bias_variance_decomp` that decomposes the loss of a regressor or classifier into bias and variance terms. ([#470](https://github.com/rasbt/mlxtend/pull/470))
 - Adds a `whitening` parameter to `PrincipalComponentAnalysis`, to optionally whiten the transformed data such that the features have unit variance. ([#475](https://github.com/rasbt/mlxtend/pull/475))
 
 ##### Changes
 
 - Changed the default solver in `PrincipalComponentAnalysis` to `'svd'` instead of `'eigen'` to improve numerical stability. ([#474](https://github.com/rasbt/mlxtend/pull/474))
+- The `mlxtend.image.extract_face_landmarks` now returns `None` if no facial landmarks were detected instead of an array of all zeros. ([#466](https://github.com/rasbt/mlxtend/pull/466))
 
 
 ##### Bug Fixes

docs/sources/user_guide/image/extract_face_landmarks.ipynb

@@ -312,9 +312,10 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.5"
+   "version": "3.6.5"
   },
   "toc": {
+   "base_numbering": 1,
    "nav_menu": {},
    "number_sections": false,
    "sideBar": true,

mlxtend/externals/pyprind/__init__.py

@@ -0,0 +1,20 @@
+"""
+Sebastian Raschka 2014-2017
+Python Progress Indicator Utility
+
+Author: Sebastian Raschka <sebastianraschka.com>
+License: BSD 3 clause
+
+Contributors: https://github.com/rasbt/pyprind/graphs/contributors
+Code Repository: https://github.com/rasbt/pyprind
+PyPI: https://pypi.python.org/pypi/PyPrind
+"""
+
+
+from .progbar import ProgBar
+from .progpercent import ProgPercent
+from .generator_factory import prog_percent
+from .generator_factory import prog_bar
+
+
+__version__ = '2.11.2'

mlxtend/externals/pyprind/generator_factory.py

@@ -0,0 +1,24 @@
+# PyPrind
+# Author: Sebastian Raschka <mail@sebastianraschka.com>
+# Contributors: https://github.com/rasbt/pyprind/graphs/contributors
+# License: BSD 3 clause
+# Code Repository: https://github.com/rasbt/pyprind
+# PyPI: https://pypi.python.org/pypi/PyPrind
+
+from .progbar import ProgBar
+from .progpercent import ProgPercent
+
+
+def generator_factory(mother_class):
+    def generator_progress(iteritem, iterations=None, *args, **kw):
+        if iterations is None:
+            iterations = len(iteritem)
+        assert iterations
+        mbar = mother_class(iterations, *args, **kw)
+        for item in iteritem:
+            yield item
+            mbar.update()
+    return generator_progress
+
+prog_percent = generator_factory(ProgPercent)
+prog_bar = generator_factory(ProgBar)