Commit 4158eb7e authored by Yuxin Wu's avatar Yuxin Wu

Finish repo rename

parent 9383740f
...@@ -88,7 +88,7 @@ deploy: ...@@ -88,7 +88,7 @@ deploy:
on: on:
tags: true tags: true
branch: master branch: master
repo: ppwwyyxx/tensorpack repo: tensorpack/tensorpack
python: "3.5" python: "3.5"
condition: "$PYPI = true" condition: "$PYPI = true"
...@@ -101,6 +101,6 @@ deploy: ...@@ -101,6 +101,6 @@ deploy:
secure: lnNfzPFSk4HF7seuu63CoUa0g4V0JPs42H5FTzWecEIro8IqjdaAvzNKuhu9E4rkrMXPzoYYA6gC4YhseT7N/jg7lyV/Nn1koGXK1gmzu5JnXZXHw5/Ri0I3hOF3OFpEvkR39tzV0r5HsO0JIU3pl11+bBS8iloEtzdTPaUaRgyYxyZGrHl8l3VnUyM50PRnPGDouK6DHxJmknnFCOZFCrEpwN4zpOs55c1rChjJ8aql69rSsXQOUP8++jRtGwgqEvHh0K86uGm1AJUYvSWmcoD+5Urcg8LGaQzySmXtJnFgxtzsORactIEJoAteSMXufWZITn4OQ5VQkc4/CfU0HgHioQw86dpdJrfOLkhEx65JxfUsQiOTgpcTOgYYEda6+dY4cnTTpj2fASVDhQMQ/vo+Ab/W14nYG8z0IPwGJ1qDXRO6AtPD7vbah2LdHQTUTiAbbtva7NWuKbFiVxD2tdrVQHKWqmKXw+JF5F8TBDEnUxFtulW2hbM+vwu6mPxbYQZEpONjLKSa7qiZ8jQZ8cy9KatQYkqPLeGEbgI+IsmA4bnJJennToyWZ2N4W071ddtLB7hDH4ZRVdaLVYtfeKW/b/+YGX3N8p5cMKGIDjpGyF0BocFalQ7gYfg2ouAn1RyEPkCaw6ntA2uzIgvTqxU5inWJCFn20Ogst0oIaPs= secure: lnNfzPFSk4HF7seuu63CoUa0g4V0JPs42H5FTzWecEIro8IqjdaAvzNKuhu9E4rkrMXPzoYYA6gC4YhseT7N/jg7lyV/Nn1koGXK1gmzu5JnXZXHw5/Ri0I3hOF3OFpEvkR39tzV0r5HsO0JIU3pl11+bBS8iloEtzdTPaUaRgyYxyZGrHl8l3VnUyM50PRnPGDouK6DHxJmknnFCOZFCrEpwN4zpOs55c1rChjJ8aql69rSsXQOUP8++jRtGwgqEvHh0K86uGm1AJUYvSWmcoD+5Urcg8LGaQzySmXtJnFgxtzsORactIEJoAteSMXufWZITn4OQ5VQkc4/CfU0HgHioQw86dpdJrfOLkhEx65JxfUsQiOTgpcTOgYYEda6+dY4cnTTpj2fASVDhQMQ/vo+Ab/W14nYG8z0IPwGJ1qDXRO6AtPD7vbah2LdHQTUTiAbbtva7NWuKbFiVxD2tdrVQHKWqmKXw+JF5F8TBDEnUxFtulW2hbM+vwu6mPxbYQZEpONjLKSa7qiZ8jQZ8cy9KatQYkqPLeGEbgI+IsmA4bnJJennToyWZ2N4W071ddtLB7hDH4ZRVdaLVYtfeKW/b/+YGX3N8p5cMKGIDjpGyF0BocFalQ7gYfg2ouAn1RyEPkCaw6ntA2uzIgvTqxU5inWJCFn20Ogst0oIaPs=
on: on:
branch: test-travis branch: test-travis
repo: ppwwyyxx/tensorpack repo: tensorpack/tensorpack
python: "3.5" python: "3.5"
condition: "$PYPI = true" condition: "$PYPI = true"
...@@ -19,54 +19,54 @@ TensorFlow itself also changed APIs before 1.0 and those are not listed here. ...@@ -19,54 +19,54 @@ TensorFlow itself also changed APIs before 1.0 and those are not listed here.
`AutoResumeTrainConfig` was added to support resuming. `AutoResumeTrainConfig` was added to support resuming.
+ [2017/10/21] + [2017/10/21]
tensorpack is gradually switching to a new Trainer API. tensorpack is gradually switching to a new Trainer API.
The old API will keep working for a while. See [issue](https://github.com/ppwwyyxx/tensorpack/issues/458) The old API will keep working for a while. See [issue](https://github.com/tensorpack/tensorpack/issues/458)
for details. for details.
+ [2017/10/18] + [2017/10/18]
`TrainConfig(predict_tower)` was deprecated. You can set the inference device directly when creating the `InferenceRunner` callback. `TrainConfig(predict_tower)` was deprecated. You can set the inference device directly when creating the `InferenceRunner` callback.
+ [2017/10/12](https://github.com/ppwwyyxx/tensorpack/commit/7e963996f615b85f7459455596b4ee9bbd0bce8e). + [2017/10/12](https://github.com/tensorpack/tensorpack/commit/7e963996f615b85f7459455596b4ee9bbd0bce8e).
`tensorpack.RL` was deprecated. The RL examples are written with OpenAI gym interface instead. `tensorpack.RL` was deprecated. The RL examples are written with OpenAI gym interface instead.
+ [2017/10/10](https://github.com/ppwwyyxx/tensorpack/commit/7d40e049691d92018f50dc7d45bba5e8b140becc). + [2017/10/10](https://github.com/tensorpack/tensorpack/commit/7d40e049691d92018f50dc7d45bba5e8b140becc).
`tfutils.distributions` was deprecated in favor of `tf.distributions` introduced in TF 1.3. `tfutils.distributions` was deprecated in favor of `tf.distributions` introduced in TF 1.3.
+ [2017/08/02](https://github.com/ppwwyyxx/tensorpack/commit/875f4d7dbb5675f54eae5675fa3a0948309a8465). + [2017/08/02](https://github.com/tensorpack/tensorpack/commit/875f4d7dbb5675f54eae5675fa3a0948309a8465).
`Trainer.get_predictor` now takes GPU id. And `Trainer.get_predictors` was deprecated. `Trainer.get_predictor` now takes GPU id. And `Trainer.get_predictors` was deprecated.
+ 2017/06/07. Now the library explicitly depends on msgpack-numpy>=0.3.9. The serialization protocol + 2017/06/07. Now the library explicitly depends on msgpack-numpy>=0.3.9. The serialization protocol
becomes incompatible if you've been using <0.3.9. becomes incompatible if you've been using <0.3.9.
+ [2017/05/06](https://github.com/ppwwyyxx/tensorpack/commit/0774ec66e66075486f6a36aba63cc2a151b9fec8). + [2017/05/06](https://github.com/tensorpack/tensorpack/commit/0774ec66e66075486f6a36aba63cc2a151b9fec8).
`replace_get_variable` was deprecated in favor of the official `custom_getter` interface. `replace_get_variable` was deprecated in favor of the official `custom_getter` interface.
`{freeze,remap}_get_variable` was renamed to `{freeze,remap}_variables`. `{freeze,remap}_get_variable` was renamed to `{freeze,remap}_variables`.
+ [2017/04/09](https://github.com/ppwwyyxx/tensorpack/commit/5beab907895aec36bdcaed62e25b976aad7979b8). + [2017/04/09](https://github.com/tensorpack/tensorpack/commit/5beab907895aec36bdcaed62e25b976aad7979b8).
`ParamRestore` was renamed to `DictRestore`. `ParamRestore` was renamed to `DictRestore`.
+ [2017/03/16](https://github.com/ppwwyyxx/tensorpack/commit/ccae46f4a3ca89dc3df901a338eef8447d19a730). + [2017/03/16](https://github.com/tensorpack/tensorpack/commit/ccae46f4a3ca89dc3df901a338eef8447d19a730).
`session_config` option in `PredictConfig` is deprecated. Use `session_creator` to define how to create session instead. `session_config` option in `PredictConfig` is deprecated. Use `session_creator` to define how to create session instead.
+ 2017/02/20. The interface of step callbacks are changed to be the same as `tf.train.SessionRunHook`. + 2017/02/20. The interface of step callbacks are changed to be the same as `tf.train.SessionRunHook`.
If you haven't written any custom step callbacks, there is nothing to do. Otherwise please refer If you haven't written any custom step callbacks, there is nothing to do. Otherwise please refer
to the [existing callbacks](https://github.com/ppwwyyxx/tensorpack/blob/master/tensorpack/callbacks/steps.py). to the [existing callbacks](https://github.com/tensorpack/tensorpack/blob/master/tensorpack/callbacks/steps.py).
+ [2017/02/12](https://github.com/ppwwyyxx/tensorpack/commit/d1041a77a9c59d8c9abf64f389f3b605d65b483e). + [2017/02/12](https://github.com/tensorpack/tensorpack/commit/d1041a77a9c59d8c9abf64f389f3b605d65b483e).
`TrainConfig(optimizer=)` was deprecated. Now optimizer is set in `ModelDesc`. And gradient processors become part of an optimizer. `TrainConfig(optimizer=)` was deprecated. Now optimizer is set in `ModelDesc`. And gradient processors become part of an optimizer.
* [2017/02/11](https://github.com/ppwwyyxx/tensorpack/commit/5b29bda9f17d7b587259e13963c4c8093e8387f8). * [2017/02/11](https://github.com/tensorpack/tensorpack/commit/5b29bda9f17d7b587259e13963c4c8093e8387f8).
`_get_input_vars()` in `ModelDesc` was renamed to `_get_inputs`. `InputVar` was renamed to `InputDesc`. `_get_input_vars()` in `ModelDesc` was renamed to `_get_inputs`. `InputVar` was renamed to `InputDesc`.
* [2017/01/27](https://github.com/ppwwyyxx/tensorpack/commit/a9dd0b8ec34209ab86a92875589dbbc4716e73ef). * [2017/01/27](https://github.com/tensorpack/tensorpack/commit/a9dd0b8ec34209ab86a92875589dbbc4716e73ef).
`TrainConfig(step_per_epoch)` was renamed to `steps_per_epoch`. `TrainConfig(step_per_epoch)` was renamed to `steps_per_epoch`.
* [2017/01/25](https://github.com/ppwwyyxx/tensorpack/commit/2df3dcf401a99fe61c699ad719e95528872d3abe). * [2017/01/25](https://github.com/tensorpack/tensorpack/commit/2df3dcf401a99fe61c699ad719e95528872d3abe).
Argument order of `models.ConcatWith` is changed to follow the API change in TensorFlow upstream. Argument order of `models.ConcatWith` is changed to follow the API change in TensorFlow upstream.
* [2017/01/25](https://github.com/ppwwyyxx/tensorpack/commit/243e957fe6d62a0cfb5728bd77fb3e005d6603e4). * [2017/01/25](https://github.com/tensorpack/tensorpack/commit/243e957fe6d62a0cfb5728bd77fb3e005d6603e4).
`TrainConfig(callbacks=)` now takes a list of `Callback` instances. `TrainConfig(callbacks=)` now takes a list of `Callback` instances.
* [2017/01/06](https://github.com/ppwwyyxx/tensorpack/commit/bbf41d9e58053f843d0471e6d2d87ff714a79a90). * [2017/01/06](https://github.com/tensorpack/tensorpack/commit/bbf41d9e58053f843d0471e6d2d87ff714a79a90).
`summary.add_moving_summary` now takes any number of positional arguments instead of a list. `summary.add_moving_summary` now takes any number of positional arguments instead of a list.
* [2017/01/05](https://github.com/ppwwyyxx/tensorpack/commit/651a5aea8f9aacad7147542021dcf106fc824bc2). * [2017/01/05](https://github.com/tensorpack/tensorpack/commit/651a5aea8f9aacad7147542021dcf106fc824bc2).
The argument `TrainConfig(dataset=)` is renamed to `TrainConfig(dataflow=)`. The argument `TrainConfig(dataset=)` is renamed to `TrainConfig(dataflow=)`.
* [2016/12/15](https://github.com/ppwwyyxx/tensorpack/commit/99c70935a7f72050f45891fbbcc49c4ce43aedce). * [2016/12/15](https://github.com/tensorpack/tensorpack/commit/99c70935a7f72050f45891fbbcc49c4ce43aedce).
The `predict_tower` option is in `TrainConfig` now instead of `Trainer`. The `predict_tower` option is in `TrainConfig` now instead of `Trainer`.
* [2016/11/10](https://github.com/ppwwyyxx/tensorpack/commit/77bcc8b1afc984a569f6ec3eda0a3c47b4e2923a). * [2016/11/10](https://github.com/tensorpack/tensorpack/commit/77bcc8b1afc984a569f6ec3eda0a3c47b4e2923a).
The `{input,output}_var_names` argument in `PredictConfig` is renamed to `{input,output}_names`. The `{input,output}_var_names` argument in `PredictConfig` is renamed to `{input,output}_names`.
* [2016/11/06](https://github.com/ppwwyyxx/tensorpack/commit/740e9d8ca146af5a911f68a369dd7348243a2253). * [2016/11/06](https://github.com/tensorpack/tensorpack/commit/740e9d8ca146af5a911f68a369dd7348243a2253).
The inferencer `ClassificationError` now expects the vector tensor returned by `prediction_incorrect` instead of the "wrong" tensor. The inferencer `ClassificationError` now expects the vector tensor returned by `prediction_incorrect` instead of the "wrong" tensor.
* [2016/10/17](https://github.com/ppwwyyxx/tensorpack/commit/6eb0bebe60d6f38bcad9ddb3e6091b0b154a09cf). * [2016/10/17](https://github.com/tensorpack/tensorpack/commit/6eb0bebe60d6f38bcad9ddb3e6091b0b154a09cf).
`Conv2D` and `FullyConnect` use `tf.identity` by default instead of `tf.nn.relu`. `Conv2D` and `FullyConnect` use `tf.identity` by default instead of `tf.nn.relu`.
* [2016/09/01](https://github.com/ppwwyyxx/tensorpack/commit/fc9e45b0208ff09daf454d3bd910c540735b7f83). * [2016/09/01](https://github.com/tensorpack/tensorpack/commit/fc9e45b0208ff09daf454d3bd910c540735b7f83).
The method `_build_graph` of `ModelDesc` doesn't take `is_training` argument anymore. The method `_build_graph` of `ModelDesc` doesn't take `is_training` argument anymore.
The `is_training` attribute can be obtained from tower context. The `is_training` attribute can be obtained from tower context.
* [2016/05/15](https://github.com/ppwwyyxx/tensorpack/commit/e69034b5c9b588db9fb52295b1e63c89e8b42654). * [2016/05/15](https://github.com/tensorpack/tensorpack/commit/e69034b5c9b588db9fb52295b1e63c89e8b42654).
The method `_get_cost` of `ModelDesc` is replaced by `_build_graph`. The method `_get_cost` of `ModelDesc` is replaced by `_build_graph`.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Tensorpack is a training interface based on TensorFlow. Tensorpack is a training interface based on TensorFlow.
[![Build Status](https://travis-ci.org/ppwwyyxx/tensorpack.svg?branch=master)](https://travis-ci.org/ppwwyyxx/tensorpack) [![Build Status](https://travis-ci.org/tensorpack/tensorpack.svg?branch=master)](https://travis-ci.org/tensorpack/tensorpack)
[![ReadTheDoc](https://readthedocs.org/projects/tensorpack/badge/?version=latest)](http://tensorpack.readthedocs.io/en/latest/index.html) [![ReadTheDoc](https://readthedocs.org/projects/tensorpack/badge/?version=latest)](http://tensorpack.readthedocs.io/en/latest/index.html)
[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/tensorpack/users) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/tensorpack/users)
[![model-zoo](https://img.shields.io/badge/model-zoo-brightgreen.svg)](http://models.tensorpack.com) [![model-zoo](https://img.shields.io/badge/model-zoo-brightgreen.svg)](http://models.tensorpack.com)
...@@ -65,7 +65,7 @@ Dependencies: ...@@ -65,7 +65,7 @@ Dependencies:
+ TensorFlow >= 1.3.0 (Optional if you only want to use `tensorpack.dataflow` alone as a data processing library) + TensorFlow >= 1.3.0 (Optional if you only want to use `tensorpack.dataflow` alone as a data processing library)
``` ```
# install git, then: # install git, then:
pip install -U git+https://github.com/ppwwyyxx/tensorpack.git pip install -U git+https://github.com/tensorpack/tensorpack.git
# or add `--user` to avoid system-wide installation. # or add `--user` to avoid system-wide installation.
``` ```
......
...@@ -402,7 +402,7 @@ def autodoc_skip_member(app, what, name, obj, skip, options): ...@@ -402,7 +402,7 @@ def autodoc_skip_member(app, what, name, obj, skip, options):
def url_resolver(url): def url_resolver(url):
if '.html' not in url: if '.html' not in url:
return "https://github.com/ppwwyyxx/tensorpack/blob/master/" + url return "https://github.com/tensorpack/tensorpack/blob/master/" + url
else: else:
if ON_RTD: if ON_RTD:
return "http://tensorpack.readthedocs.io/" + url return "http://tensorpack.readthedocs.io/" + url
......
...@@ -37,13 +37,13 @@ Alternative link to this page: [http://dorefa.net](http://dorefa.net) ...@@ -37,13 +37,13 @@ Alternative link to this page: [http://dorefa.net](http://dorefa.net)
## Use ## Use
+ Install [tensorpack](https://github.com/ppwwyyxx/tensorpack) and scipy. + Install tensorpack and scipy.
+ Look at the docstring in `*-dorefa.py` to see detailed usage and performance. + Look at the docstring in `*-dorefa.py` to see detailed usage and performance.
## Support ## Support
Please use [github issues](https://github.com/ppwwyyxx/tensorpack/issues) for any issues related to the code itself. Please use [github issues](https://github.com/tensorpack/tensorpack/issues) for any issues related to the code itself.
Please send email to the authors for general questions related to the paper. Please send email to the authors for general questions related to the paper.
## Citation ## Citation
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# File: load-resnet.py # File: load-resnet.py
# Author: Eric Yujia Huang <yujiah1@andrew.cmu.edu> # Author: Eric Yujia Huang <yujiah1@andrew.cmu.edu>
# Yuxin Wu <ppwwyyxx@gmail.com> # Yuxin Wu
import cv2 import cv2
import functools import functools
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# File: checkpoint-manipulate.py # File: checkpoint-manipulate.py
# Author: Yuxin Wu <ppwwyyxxc@gmail.com>
import numpy as np import numpy as np
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# File: dump-model-params.py # File: dump-model-params.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com>
import numpy as np import numpy as np
import six import six
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# File: ls-checkpoint.py # File: ls-checkpoint.py
# Author: Yuxin Wu <ppwwyyxxc@gmail.com>
import tensorflow as tf import tensorflow as tf
import numpy as np import numpy as np
......
[metadata] [metadata]
author = TensorPack contributors author = TensorPack contributors
author-email = ppwwyyxxc@gmail.com author-email = ppwwyyxxc@gmail.com
url = https://github.com/ppwwyyxx/tensorpack url = https://github.com/tensorpack/tensorpack
keywords = tensorflow, deep learning, neural network keywords = tensorflow, deep learning, neural network
license = Apache license = Apache
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# File: __init__.py # File: __init__.py
# flake8: noqa
import os as _os
from tensorpack.libinfo import __version__, _HAS_TF from tensorpack.libinfo import __version__, _HAS_TF
from tensorpack.utils import * from tensorpack.utils import *
......
...@@ -36,7 +36,7 @@ class RunOp(Callback): ...@@ -36,7 +36,7 @@ class RunOp(Callback):
Examples: Examples:
The `DQN Example The `DQN Example
<https://github.com/ppwwyyxx/tensorpack/blob/master/examples/DeepQNetwork/>`_ <https://github.com/tensorpack/tensorpack/blob/master/examples/DeepQNetwork/>`_
uses this callback to update target network. uses this callback to update target network.
""" """
if not callable(op): if not callable(op):
......
...@@ -35,7 +35,7 @@ class NewSessionCreator(tf.train.ChiefSessionCreator): ...@@ -35,7 +35,7 @@ class NewSessionCreator(tf.train.ChiefSessionCreator):
self.user_provided_config = True self.user_provided_config = True
logger.warn( logger.warn(
"Some options in custom session config may not work due to TF \ "Some options in custom session config may not work due to TF \
bugs. See https://github.com/ppwwyyxx/tensorpack/issues/497 for workarounds.") bugs. See https://github.com/tensorpack/tensorpack/issues/497 for workarounds.")
self.config = config self.config = config
super(NewSessionCreator, self).__init__(master=target, config=config) super(NewSessionCreator, self).__init__(master=target, config=config)
......
...@@ -14,7 +14,6 @@ from ..utils import logger ...@@ -14,7 +14,6 @@ from ..utils import logger
from ..utils.utils import humanize_time_delta from ..utils.utils import humanize_time_delta
from ..utils.argtools import call_only_once from ..utils.argtools import call_only_once
from ..tfutils import get_global_step_value from ..tfutils import get_global_step_value
from ..tfutils.tower import TowerFuncWrapper
from ..tfutils.model_utils import describe_trainable_vars from ..tfutils.model_utils import describe_trainable_vars
from ..tfutils.sessinit import SessionInit, JustCurrentSession from ..tfutils.sessinit import SessionInit, JustCurrentSession
from ..tfutils.sesscreate import ReuseSessionCreator, NewSessionCreator from ..tfutils.sesscreate import ReuseSessionCreator, NewSessionCreator
...@@ -25,7 +24,7 @@ from .config import TrainConfig, DEFAULT_MONITORS, DEFAULT_CALLBACKS ...@@ -25,7 +24,7 @@ from .config import TrainConfig, DEFAULT_MONITORS, DEFAULT_CALLBACKS
__all__ = ['StopTraining', 'Trainer'] __all__ = ['StopTraining', 'Trainer']
class StopTraining(BaseException): class StopTraining(Exception):
""" """
An exception thrown to stop training. An exception thrown to stop training.
""" """
...@@ -101,7 +100,7 @@ class Trainer(object): ...@@ -101,7 +100,7 @@ class Trainer(object):
Certain callbacks will only be run by chief worker. Certain callbacks will only be run by chief worker.
""" """
def __init__(self, config=None): def __init__(self):
""" """
config is only for compatibility reasons in case you're config is only for compatibility reasons in case you're
using custom trainers with old-style API. using custom trainers with old-style API.
...@@ -110,34 +109,6 @@ class Trainer(object): ...@@ -110,34 +109,6 @@ class Trainer(object):
self._callbacks = [] self._callbacks = []
self.loop = TrainLoop() self.loop = TrainLoop()
# Hacks!
if config is not None:
logger.warn("You're initializing new trainer with old trainer API!")
logger.warn("This could happen if you wrote a custom trainer before.")
logger.warn("It may work now through some hacks, but please switch to the new API!")
logger.warn("See https://github.com/ppwwyyxx/tensorpack/issues/458 for more information.")
config._deprecated_parsing()
self._config = config
self.inputs_desc = config.model.get_inputs_desc()
self.tower_func = TowerFuncWrapper(
lambda *inputs: config.model.build_graph(*inputs),
self.inputs_desc)
self._main_tower_vs_name = ""
def gp(input_names, output_names, tower=0):
from .tower import TowerTrainer
return TowerTrainer.get_predictor(self, input_names, output_names, device=tower)
self.get_predictor = gp
old_train = self.train
def train():
return old_train(
config.callbacks, config.monitors,
config.session_creator, config.session_init,
config.steps_per_epoch, config.starting_epoch, config.max_epoch)
self.train = train
def _register_callback(self, cb): def _register_callback(self, cb):
""" """
Register callbacks to the trainer. Register callbacks to the trainer.
...@@ -170,7 +141,7 @@ class Trainer(object): ...@@ -170,7 +141,7 @@ class Trainer(object):
Defines what to do in one iteration. The default is: Defines what to do in one iteration. The default is:
``self.hooked_sess.run(self.train_op)``. ``self.hooked_sess.run(self.train_op)``.
The behavior can be changed by either defining what is ``train_op``, The behavior of each iteration can be changed by either setting ``trainer.train_op``,
or overriding this method. or overriding this method.
""" """
if not hasattr(self, 'train_op'): if not hasattr(self, 'train_op'):
...@@ -343,7 +314,7 @@ class Trainer(object): ...@@ -343,7 +314,7 @@ class Trainer(object):
else: else:
logger.warn("You're calling new trainers with old trainer API!") logger.warn("You're calling new trainers with old trainer API!")
logger.warn("Now it returns the old trainer for you, please switch to use new trainers soon!") logger.warn("Now it returns the old trainer for you, please switch to use new trainers soon!")
logger.warn("See https://github.com/ppwwyyxx/tensorpack/issues/458 for more information.") logger.warn("See https://github.com/tensorpack/tensorpack/issues/458 for more information.")
return old_trainer(*args, **kwargs) return old_trainer(*args, **kwargs)
else: else:
return super(Trainer, cls).__new__(cls) return super(Trainer, cls).__new__(cls)
......
...@@ -157,13 +157,13 @@ class TrainConfig(object): ...@@ -157,13 +157,13 @@ class TrainConfig(object):
@property @property
def nr_tower(self): def nr_tower(self):
logger.warn("TrainConfig.nr_tower was deprecated! Set the number of GPUs on the trainer instead!") logger.warn("TrainConfig.nr_tower was deprecated! Set the number of GPUs on the trainer instead!")
logger.warn("See https://github.com/ppwwyyxx/tensorpack/issues/458 for more information.") logger.warn("See https://github.com/tensorpack/tensorpack/issues/458 for more information.")
return len(self.tower) return len(self.tower)
@nr_tower.setter @nr_tower.setter
def nr_tower(self, value): def nr_tower(self, value):
logger.warn("TrainConfig.nr_tower was deprecated! Set the number of GPUs on the trainer instead!") logger.warn("TrainConfig.nr_tower was deprecated! Set the number of GPUs on the trainer instead!")
logger.warn("See https://github.com/ppwwyyxx/tensorpack/issues/458 for more information.") logger.warn("See https://github.com/tensorpack/tensorpack/issues/458 for more information.")
self.tower = list(range(value)) self.tower = list(range(value))
def _deprecated_parsing(self): def _deprecated_parsing(self):
......
...@@ -94,7 +94,7 @@ def fix_rng_seed(seed): ...@@ -94,7 +94,7 @@ def fix_rng_seed(seed):
seed (int): seed (int):
Note: Note:
See https://github.com/ppwwyyxx/tensorpack/issues/196. See https://github.com/tensorpack/tensorpack/issues/196.
Examples: Examples:
......
...@@ -164,7 +164,7 @@ def stack_patches( ...@@ -164,7 +164,7 @@ def stack_patches(
""" """
Stacked patches into grid, to produce visualizations like the following: Stacked patches into grid, to produce visualizations like the following:
.. image:: https://github.com/ppwwyyxx/tensorpack/raw/master/examples/GAN/demo/BEGAN-CelebA-samples.jpg .. image:: https://github.com/tensorpack/tensorpack/raw/master/examples/GAN/demo/BEGAN-CelebA-samples.jpg
Args: Args:
patch_list(list[ndarray] or ndarray): NHW or NHWC images in [0,255]. patch_list(list[ndarray] or ndarray): NHW or NHWC images in [0,255].
......
#!/bin/bash -e #!/bin/bash -e
# File: run-tests.sh # File: run-tests.sh
# Author: Yuxin Wu <ppwwyyxxc@gmail.com>
DIR=$(dirname $0) DIR=$(dirname $0)
cd $DIR cd $DIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment