Commit 14964cc7 authored by Yuxin Wu's avatar Yuxin Wu

bump to 0.9.0.1

parent 51db9d83
...@@ -5,6 +5,7 @@ import tensorflow as tf ...@@ -5,6 +5,7 @@ import tensorflow as tf
from tensorpack.tfutils.summary import add_moving_summary from tensorpack.tfutils.summary import add_moving_summary
from tensorpack.tfutils.argscope import argscope from tensorpack.tfutils.argscope import argscope
from tensorpack.tfutils.common import get_tf_version_tuple
from tensorpack.tfutils.scope_utils import under_name_scope from tensorpack.tfutils.scope_utils import under_name_scope
from tensorpack.models import ( from tensorpack.models import (
Conv2D, FullyConnected, layer_register) Conv2D, FullyConnected, layer_register)
...@@ -220,8 +221,10 @@ def fastrcnn_predictions(boxes, scores): ...@@ -220,8 +221,10 @@ def fastrcnn_predictions(boxes, scores):
default_value=False) default_value=False)
return mask return mask
# TF bug in version 1.11, 1.12: https://github.com/tensorflow/tensorflow/issues/22750
parallel = 1 if (get_tf_version_tuple() in [(1, 11), (1, 12)]) else 10
masks = tf.map_fn(f, (scores, boxes), dtype=tf.bool, masks = tf.map_fn(f, (scores, boxes), dtype=tf.bool,
parallel_iterations=10) # #cat x N parallel_iterations=parallel) # #cat x N
selected_indices = tf.where(masks) # #selection x 2, each is (cat_id, box_id) selected_indices = tf.where(masks) # #selection x 2, each is (cat_id, box_id)
scores = tf.boolean_mask(scores, masks) scores = tf.boolean_mask(scores, masks)
......
...@@ -496,9 +496,6 @@ if __name__ == '__main__': ...@@ -496,9 +496,6 @@ if __name__ == '__main__':
if get_tf_version_tuple() < (1, 6): if get_tf_version_tuple() < (1, 6):
# https://github.com/tensorflow/tensorflow/issues/14657 # https://github.com/tensorflow/tensorflow/issues/14657
logger.warn("TF<1.6 has a bug which may lead to crash in FasterRCNN if you're unlucky.") logger.warn("TF<1.6 has a bug which may lead to crash in FasterRCNN if you're unlucky.")
if get_tf_version_tuple() == (1, 11):
# https://github.com/tensorflow/tensorflow/issues/22750
logger.warn("TF=1.11 has a bug which leads to crash in inference.")
args = parser.parse_args() args = parser.parse_args()
if args.config: if args.config:
......
...@@ -54,4 +54,4 @@ except ImportError: ...@@ -54,4 +54,4 @@ except ImportError:
# This line has to be the last line of the file. # This line has to be the last line of the file.
# setup.py will use it to determine the version # setup.py will use it to determine the version
__version__ = '0.9.0' __version__ = '0.9.0.1'
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