From 73c665b364812892d0810ca7f7e8b4590d4236d0 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Mon, 7 May 2018 16:18:08 +0200
Subject: [PATCH] Removed download_function
Putting back the old path. I need to be able to debug it in my desktop
Added some documentation
---
bob/ip/tensorflow_extractor/DrGanMSU.py | 3 +--
bob/ip/tensorflow_extractor/FaceNet.py | 21 +++++++++++------
bob/ip/tensorflow_extractor/__init__.py | 31 -------------------------
3 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/bob/ip/tensorflow_extractor/DrGanMSU.py b/bob/ip/tensorflow_extractor/DrGanMSU.py
index 28157cc..65caaa1 100644
--- a/bob/ip/tensorflow_extractor/DrGanMSU.py
+++ b/bob/ip/tensorflow_extractor/DrGanMSU.py
@@ -6,7 +6,6 @@ import numpy
import tensorflow as tf
import os
from bob.extension import rc
-from . import download_file
import logging
import bob.extension.download
import bob.io.base
@@ -358,7 +357,7 @@ class DrGanMSUExtractor(object):
"DR_GAN_model.zip")
urls = [
# This is a private link at Idiap to save bandwidth.
- "http://www.idiap.ch/private/wheels/gitlab/"
+ "http://beatubulatest.lab.idiap.ch/private/wheels/gitlab/"
"DR_GAN_model.zip",
]
diff --git a/bob/ip/tensorflow_extractor/FaceNet.py b/bob/ip/tensorflow_extractor/FaceNet.py
index 1b50ea6..169573c 100644
--- a/bob/ip/tensorflow_extractor/FaceNet.py
+++ b/bob/ip/tensorflow_extractor/FaceNet.py
@@ -6,7 +6,6 @@ import numpy
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
import bob.extension.download
import bob.io.base
@@ -77,7 +76,7 @@ class FaceNet(object):
def __init__(self,
model_path=rc["bob.ip.tensorflow_extractor.facenet_modelpath"],
image_size=160,
- **kwargs):
+ **kwargs):
super(FaceNet, self).__init__()
self.model_path = model_path
self.image_size = image_size
@@ -103,16 +102,14 @@ class FaceNet(object):
"20170512-110547.zip")
urls = [
# This is a private link at Idiap to save bandwidth.
- "http://www.idiap.ch/private/wheels/gitlab/"
+ "http://beatubulatest.lab.idiap.ch/private/wheels/gitlab/"
"facenet_model2_20170512-110547.zip",
# this works for everybody
"https://drive.google.com/uc?export=download&id="
"0B5MzpY9kBtDVZ2RpVDYwWmxoSUk",
- ]
-
+ ]
bob.extension.download.download_and_unzip(urls, zip_file)
-
-
+
# code from https://github.com/davidsandberg/facenet
model_exp = os.path.expanduser(self.model_path)
if (os.path.isfile(model_exp)):
@@ -157,10 +154,20 @@ class FaceNet(object):
@staticmethod
def get_rcvariable():
+ """
+ Variable name used in the Bob Global Configuration System
+ https://www.idiap.ch/software/bob/docs/bob/bob.extension/stable/rc.html#global-configuration-system
+ """
return "bob.ip.tensorflow_extractor.facenet_modelpath"
@staticmethod
def get_modelpath():
+ """
+ Get default model path.
+
+ First we try the to search this path via Global Configuration System.
+ If we can not find it, we set the path in the directory `<project>/data`
+ """
# Priority to the RC path
model_path = rc[FaceNet.get_rcvariable()]
diff --git a/bob/ip/tensorflow_extractor/__init__.py b/bob/ip/tensorflow_extractor/__init__.py
index af38dd5..7c21c73 100755
--- a/bob/ip/tensorflow_extractor/__init__.py
+++ b/bob/ip/tensorflow_extractor/__init__.py
@@ -26,37 +26,6 @@ def scratch_network(inputs, end_point="fc1", reuse=False):
return end_points[end_point]
-def download_file(url, out_file):
- """Downloads a file from a given url
-
- Parameters
- ----------
- url : str
- The url to download form.
- out_file : str
- Where to save the file.
- """
- from bob.io.base import create_directories_safe
- import os
- create_directories_safe(os.path.dirname(out_file))
-
- import sys
- if sys.version_info[0] < 3:
- # python2 technique for downloading a file
- from urllib2 import urlopen
- with open(out_file, 'wb') as f:
- response = urlopen(url)
- f.write(response.read())
-
- else:
- # python3 technique for downloading a file
- from urllib.request import urlopen
- from shutil import copyfileobj
- with urlopen(url) as response:
- with open(out_file, 'wb') as f:
- copyfileobj(response, f)
-
-
def get_config():
"""Returns a string containing the configuration information.
"""
--
GitLab