Merge branch 'global-config' into 'master'

Added support to the new bob.extension global config. Added the variables…

See merge request !5

bob/ip/tensorflow_extractor/DrGanMSU.py

@@ -5,7 +5,7 @@
 import numpy
 import tensorflow as tf
 import os
-import pkg_resources
+from bob.extension import rc
 from . import download_file
 import logging
 logger = logging.getLogger(__name__)
@@ -331,7 +331,7 @@ class DrGanMSUExtractor(object):
       
     """
 
-    def __init__(self, model_path=None, image_size=[96, 96, 3]):
+    def __init__(self, model_path=rc["drgan_modelpath"], image_size=[96, 96, 3]):
 
         self.image_size = image_size
         self.session = tf.Session()

bob/ip/tensorflow_extractor/FaceNet.py

@@ -7,6 +7,8 @@ import tensorflow as tf
 from bob.ip.color import gray_to_rgb
 from bob.io.image import to_matplotlib
 from . import download_file
+from bob.extension import rc
+
 
 logger = logging.getLogger(__name__)
 
@@ -72,7 +74,7 @@ class FaceNet(object):
     """
 
     def __init__(self,
-                 model_path=None,
+                 model_path=rc["facenet_modelpath"],
                  image_size=160,
                  **kwargs):
         super(FaceNet, self).__init__()