Skip to content

Commit 0efdbb9

Browse files
author
autoih
committed
Merge branch 'master' of https://github.com/tensorflow/addons into doctest
2 parents 16bec69 + 0f64fda commit 0efdbb9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2842
-171
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Copyright 2018 The TensorFlow Authors. All rights reserved.
188188
same "printed page" as the copyright notice for easier
189189
identification within third-party archives.
190190

191-
Copyright 2019, The TensorFlow Authors.
191+
Copyright [yyyy] [name of copyright owner]
192192

193193
Licensed under the Apache License, Version 2.0 (the "License");
194194
you may not use this file except in compliance with the License.

build_deps/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# TensorFlow greater than this date is manylinux2010 compliant
2-
tf-nightly==2.1.0.dev20191029
2+
tf-nightly>=2.1.0.dev20191004

docs/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ warning.
126126

127127
## Contributing
128128
TF-Addons is a community led open source project. As such, the project
129-
depends on public contributions, bug-fixes, and documentation. Please
130-
see [contribution guidelines](CONTRIBUTING.md) for a guide on how to
131-
contribute. This project adheres to [TensorFlow's code of conduct](CODE_OF_CONDUCT.md).
129+
depends on public contributions, bug-fixes, and documentation. Please see
130+
[contribution guidelines](https://github.com/tensorflow/addons/blob/master/CONTRIBUTING.md)
131+
for a guide on how to contribute. This project adheres to [TensorFlow's code of conduct](https://github.com/tensorflow/addons/blob/master/CODE_OF_CONDUCT.md).
132132
By participating, you are expected to uphold this code.
133133

134134
## Community

tensorflow_addons/callbacks/tqdm_progress_bar.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,17 @@ def format_metrics(self, logs={}, factor=1):
200200
metric_value_pairs.append(pair)
201201
metrics_string = self.metrics_separator.join(metric_value_pairs)
202202
return metrics_string
203+
204+
def get_config(self):
205+
config = {
206+
'metrics_separator': self.metrics_separator,
207+
'overall_bar_format': self.overall_bar_format,
208+
'epoch_bar_format': self.epoch_bar_format,
209+
'leave_epoch_progress': self.leave_epoch_progress,
210+
'leave_overall_progress': self.leave_overall_progress,
211+
'show_epoch_progress': self.show_epoch_progress,
212+
'show_overall_progress': self.show_overall_progress,
213+
}
214+
215+
base_config = super(TQDMProgressBar, self).get_config()
216+
return dict(list(base_config.items()) + list(config.items()))

tensorflow_addons/custom_ops/image/BUILD

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,16 @@ custom_op_library(
3535
"cc/kernels/image_projective_transform_op_gpu.cu.cc",
3636
],
3737
)
38+
39+
custom_op_library(
40+
name = "_resampler_ops.so",
41+
srcs = [
42+
"cc/kernels/resampler_ops.cc",
43+
"cc/kernels/resampler_ops.h",
44+
"cc/ops/resampler_ops.cc",
45+
],
46+
cuda_srcs = [
47+
"cc/kernels/resampler_ops.h",
48+
"cc/kernels/resampler_ops_gpu.cu.cc",
49+
],
50+
)

0 commit comments

Comments
 (0)