diff --git a/bob/learn/tensorflow/script/db_to_tfrecords.py b/bob/learn/tensorflow/script/db_to_tfrecords.py index 3a508a30a323260a4ee2a3266b7e3ae76b06cb5b..aa0e3b1edb46926d2d8e9a0ff55d0f06f8fe9c73 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 d9539d4a6eea14f7ac60ce82438b1fe9b319b89e..06304fe254ae3c8efe88d9de96f73d5b2936980a 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 87ec3e0f98341b21522c03d8fd614c4b69ba69b7..c648e44fefed6c655c68b3dc69a008c6f28f027b 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 97d2141a4471822ac2bfab30b133b8baa874058d..be11dec7f487ef9143f333b20d56171c69d38598 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 b9c2c0266140a2620813fd00f7c9c532e493d593..bcddb4481cbd6003edff71862f2d8a59b91de431 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 99ef41bd7de4925d54a847d2434a8e829c9760e3..ce43cc668e30e21ea9eddff960cd79826891be61 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 6fdb3f2fa48f4c8664df2acf3188b24ae9e2ba3e..29cd5fde04de369c83af34abd80b7c31e2909f50 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>']