From f2cc091a4e2fc15c45b4b4cfa218494cb26c1352 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Fri, 1 Dec 2017 10:48:13 +0100
Subject: [PATCH] Use bob.extension to load the config files
---
bob/learn/tensorflow/script/db_to_tfrecords.py | 2 +-
bob/learn/tensorflow/script/eval_generic.py | 2 +-
bob/learn/tensorflow/script/predict_bio.py | 3 ++-
bob/learn/tensorflow/script/predict_generic.py | 3 ++-
bob/learn/tensorflow/script/train_generic.py | 2 +-
bob/learn/tensorflow/test/test_estimator_scripts.py | 6 +-----
bob/learn/tensorflow/utils/commandline.py | 4 ++--
7 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/bob/learn/tensorflow/script/db_to_tfrecords.py b/bob/learn/tensorflow/script/db_to_tfrecords.py
index 3a508a30..aa0e3b1e 100644
--- a/bob/learn/tensorflow/script/db_to_tfrecords.py
+++ b/bob/learn/tensorflow/script/db_to_tfrecords.py
@@ -93,7 +93,7 @@ import random
import pkg_resources
import tensorflow as tf
from bob.io.base import create_directories_safe
-from bob.bio.base.utils import read_config_file
+from bob.extension.config import load as read_config_file
from bob.learn.tensorflow.utils.commandline import \
get_from_config_or_commandline
from bob.core.log import setup, set_verbosity_level
diff --git a/bob/learn/tensorflow/script/eval_generic.py b/bob/learn/tensorflow/script/eval_generic.py
index d9539d4a..06304fe2 100644
--- a/bob/learn/tensorflow/script/eval_generic.py
+++ b/bob/learn/tensorflow/script/eval_generic.py
@@ -43,7 +43,7 @@ import os
import time
import six
import tensorflow as tf
-from bob.bio.base.utils import read_config_file
+from bob.extension.config import load as read_config_file
from ..utils.eval import get_global_step
diff --git a/bob/learn/tensorflow/script/predict_bio.py b/bob/learn/tensorflow/script/predict_bio.py
index 87ec3e0f..c648e44f 100644
--- a/bob/learn/tensorflow/script/predict_bio.py
+++ b/bob/learn/tensorflow/script/predict_bio.py
@@ -112,7 +112,8 @@ from multiprocessing import Pool
from collections import defaultdict
import numpy as np
from bob.io.base import create_directories_safe
-from bob.bio.base.utils import read_config_file, save
+from bob.bio.base.utils import save
+from bob.extension.config import load as read_config_file
from bob.bio.base.tools.grid import indices
from bob.learn.tensorflow.utils.commandline import \
get_from_config_or_commandline
diff --git a/bob/learn/tensorflow/script/predict_generic.py b/bob/learn/tensorflow/script/predict_generic.py
index 97d2141a..be11dec7 100644
--- a/bob/learn/tensorflow/script/predict_generic.py
+++ b/bob/learn/tensorflow/script/predict_generic.py
@@ -53,7 +53,8 @@ from multiprocessing import Pool
from collections import defaultdict
import numpy as np
from bob.io.base import create_directories_safe
-from bob.bio.base.utils import read_config_file, save
+from bob.extension.config import load as read_config_file
+from bob.bio.base.utils import save
from bob.learn.tensorflow.utils.commandline import \
get_from_config_or_commandline
from bob.core.log import setup, set_verbosity_level
diff --git a/bob/learn/tensorflow/script/train_generic.py b/bob/learn/tensorflow/script/train_generic.py
index b9c2c026..bcddb448 100644
--- a/bob/learn/tensorflow/script/train_generic.py
+++ b/bob/learn/tensorflow/script/train_generic.py
@@ -39,7 +39,7 @@ from __future__ import division
from __future__ import print_function
# import pkg_resources so that bob imports work properly:
import pkg_resources
-from bob.bio.base.utils import read_config_file
+from bob.extension.config import load as read_config_file
from bob.learn.tensorflow.utils.commandline import \
get_from_config_or_commandline
from bob.core.log import setup, set_verbosity_level
diff --git a/bob/learn/tensorflow/test/test_estimator_scripts.py b/bob/learn/tensorflow/test/test_estimator_scripts.py
index 99ef41bd..ce43cc66 100644
--- a/bob/learn/tensorflow/test/test_estimator_scripts.py
+++ b/bob/learn/tensorflow/test/test_estimator_scripts.py
@@ -2,8 +2,6 @@ from __future__ import print_function
import os
from tempfile import mkdtemp
import shutil
-import logging
-logging.getLogger("tensorflow").setLevel(logging.WARNING)
from bob.io.base.test_utils import datafile
from bob.learn.tensorflow.script.db_to_tfrecords import main as tfrecords
@@ -13,7 +11,6 @@ from bob.learn.tensorflow.script.eval_generic import main as eval_generic
dummy_tfrecord_config = datafile('dummy_verify_config.py', __name__)
CONFIG = '''
import tensorflow as tf
-from bob.learn.tensorflow.utils.reproducible import run_config
from bob.learn.tensorflow.dataset.tfrecords import shuffle_data_and_labels, \
batch_data_and_labels
@@ -88,8 +85,7 @@ def model_fn(features, labels, mode, params, config):
eval_metric_ops=metrics)
-estimator = tf.estimator.Estimator(model_fn=model_fn, model_dir=model_dir,
- config=run_config)
+estimator = tf.estimator.Estimator(model_fn=model_fn, model_dir=model_dir)
'''
diff --git a/bob/learn/tensorflow/utils/commandline.py b/bob/learn/tensorflow/utils/commandline.py
index 6fdb3f2f..29cd5fde 100644
--- a/bob/learn/tensorflow/utils/commandline.py
+++ b/bob/learn/tensorflow/utils/commandline.py
@@ -11,7 +11,7 @@ def get_from_config_or_commandline(config, keyword, args, defaults,
Parameters
----------
- config : object
+ config : :any:`module`
The loaded config files.
keyword : str
The keyword to load from the config file or through command line.
@@ -30,7 +30,7 @@ def get_from_config_or_commandline(config, keyword, args, defaults,
Example
-------
- >>> from bob.bio.base.utils import read_config_file
+ >>> from bob.extension.config import load as read_config_file
>>> defaults = docopt(docs, argv=[""])
>>> args = docopt(docs, argv=argv)
>>> config_files = args['<config_files>']
--
GitLab