GitLab

* Merged commit includes the following changes:
249218656  by tianlin<tianlin@google.com>:

    Deal with imports, fix a typo and make unit tests fast.

--
249198645  by tianlin<tianlin@google.com>:

    Trivial: Remove one empty line before "import tensorflow"

--
249195490  by tianlin<tianlin@google.com>:

    Initialize Transformer TF V2 Model with Keras subclassing implementation. (Compatible with TF V1)

--
249195008  by tianlin<tianlin@google.com>:

    Internal change

249173564  by hongkuny<hongkuny@google.com>:

    Internal change

249079258  by hongkuny<hongkuny@google.com>:

    Internal change

247691534  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

247533725  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

247509295  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

247311355  by wangtz<wangtz@google.com>:

    Internal change

247303127  by wangtz<wangtz@google.com>:

    Minor changes

--
247277315  by wangtz<wangtz@google.com>:

    Internal change

247143663  by wangtz<wangtz@google.com>:

    Internal change

247129668  by wangtz<wangtz@google.com>:

    Internal change

--
247110547  by wangtz<wangtz@google.com>:

    Internal change

247016722  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

246677582  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

245821839  by shiningsun<shiningsun@google.com>:

    Internal change

245353681  by gjn<gjn@google.com>:

    Internal change

245340898  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

245291749  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

245155641  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

244962751  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

244395199  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

244098932  by shiningsun<shiningsun@google.com>:

    Internal change

244019160  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

242965373  by shiningsun<shiningsun@google.com>:

    Internal change

242930998  by shiningsun<shiningsun@google.com>:

    Internal change

242914617  by shiningsun<shiningsun@google.com>:

    Internal change

242510000  by shiningsun<shiningsun@google.com>:

    Internal change

242183356  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

242049350  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

241749800  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

241663771  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

241416315  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

241054800  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

241028555  by yuefengz<yuefengz@google.com>:

    Internal change

240683076  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

240404735  by yuefengz<yuefengz@google.com>:

    Internal change

239892001  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

239316550  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

238316437  by shiningsun<shiningsun@google.com>:

    Internal change

238251867  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

237876559  by taylorrobie<taylorrobie@google.com>:

    Internal change

236346619  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

236182665  by tayo<tayo@google.com>:

    Internal change

235035787  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

234652747  by wangtz<wangtz@google.com>:

    Internal change

234606543  by wangtz<wangtz@google.com>:

    Internal change

233837502  by shiningsun<shiningsun@google.com>:

    Internal change

232033015  by shiningsun<shiningsun@google.com>:

    Internal change

232028127  by shiningsun<shiningsun@google.com>:

    Internal change

232026986  by shiningsun<shiningsun@google.com>:

    Internal change

232024086  by shiningsun<shiningsun@google.com>:

    Internal change

229839087  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

229794563  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

229204024  by shiningsun<shiningsun@google.com>:

    Internal change

228956426  by shiningsun<shiningsun@google.com>:

    Internal change

228610870  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

228586727  by haoyuzhang<haoyuzhang@google.com>:

    Internal change

228564809  by taylorrobie<taylorrobie@google.com>:

    Internal change

227080093  by shiningsun<shiningsun@google.com>:

    Internal change

227052580  by shiningsun<shiningsun@google.com>:

    Internal change

226217872  by gsundeep<gsundeep@google.com>:

    Internal change

225436264  by shiningsun<shiningsun@google.com>:

    Internal change

222283824  by taylorrobie<taylorrobie@google.com>:

    Internal change

219719958  by taylorrobie<taylorrobie@google.com>:

    Internal change

219330498  by taylorrobie<taylorrobie@google.com>:

    Internal change

219241224  by taylorrobie<taylorrobie@google.com>:

    Internal change

218774474  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

218610966  by taylorrobie<taylorrobie@google.com>:

    Internal change

218576353  by taylorrobie<taylorrobie@google.com>:

    Internal change

217815929  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

217776707  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

217749789  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

217029365  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

216803510  by taylorrobie<taylorrobie@google.com>:

    Internal change

216570979  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

215640939  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

214516790  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

212485310  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

212339556  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

210935187  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

210658133  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

207194426  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

206963562  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

206866123  by taylorrobie<taylorrobie@google.com>:

    Internal change

206631416  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

206180517  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

206170536  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

205252141  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

204191308  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

202519641  by scottzhu<scottzhu@google.com>:

    Internal change

201577585  by scottzhu<scottzhu@google.com>:

    Internal change

201299684  by kathywu<kathywu@google.com>:

    Internal change

199825697  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

199655516  by karmel<karmel@google.com>:

    Internal change

199654555  by karmel<karmel@google.com>:

    Internal change

199653009  by karmel<karmel@google.com>:

    Internal change

199209802  by karmel<karmel@google.com>:

    Internal change

198089630  by karmel<karmel@google.com>:

    Internal change

198064765  by karmel<karmel@google.com>:
    Automated rollback of changelist 197740116.

198060863  by karmel<karmel@google.com>:
    Automated rollback of changelist 197920496.

197920496  by kathywu<kathywu@google.com>:

    Internal change

197841416  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

197740116  by kathywu<kathywu@google.com>:

    Internal change

196608994  by karmel<karmel@google.com>:

    Internal change

196172336  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

195867348  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

195725348  by taylorrobie<taylorrobie@google.com>:

    Internal change

195283704  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

194960508  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

194662698  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

194103064  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

193735742  by saeta<saeta@google.com>:

    Support legacy clusters

--
193581866  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

193567921  by taylorrobie<taylorrobie@google.com>:

    Internal change

193072964  by taylorrobie<taylorrobie@google.com>:

    Internal change

192783651  by scottzhu<scottzhu@google.com>:
    Automated rollback of changelist 192714881.

192714881  by scottzhu<scottzhu@google.com>:
    Automated rollback of changelist 192710755.

192710755  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

192374551  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

192346754  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

192298443  by karmel<karmel@google.com>:

    Internal change

192220576  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

191937900  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

191909212  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

191602380  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

191514106  by scottzhu<scottzhu@google.com>:

    Internal change

191355033  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

191327699  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

190938103  by karmel<karmel@google.com>:

    Internal change

190804388  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

190780502  by karmel<karmel@google.com>:

    Internal change

190479716  by karmel<karmel@google.com>:

    Internal change

190289991  by karmel<karmel@google.com>:

    Internal change

189844661  by scottzhu<scottzhu@google.com>:
    Automated rollback of changelist 189816818.

189816818  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

189796731  by kathywu<kathywu@google.com>:

    Internal change

189639056  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

189628781  by karmel<karmel@google.com>:

    Internal change

189267175  by karmel<karmel@google.com>:

    Internal change

189222334  by karmel<karmel@google.com>:

    Internal change

189096159  by karmel<karmel@google.com>:

    Internal change

189085341  by karmel<karmel@google.com>:

    Internal change

188949700  by karmel<karmel@google.com>:

    Internal change

188780170  by karmel<karmel@google.com>:

    Internal change

188525399  by karmel<karmel@google.com>:

    Internal change

188189681  by karmel<karmel@google.com>:

    Internal change

188076840  by wun<wun@google.com>:

    Internal change

188074937  by wun<wun@google.com>:

    Internal change

187764140  by wun<wun@google.com>:

    Internal change

187663993  by wun<wun@google.com>:

    Internal change

187651035  by karmel<karmel@google.com>:

    Internal change

187415223  by A. Unique TensorFlower<gardener@tensorflow.org>:

    Internal change

187047094  by saeta<saeta@google.com>:

    Integrate ClusterResolvers with TPUEstimator.

--
186843813  by karmel<karmel@google.com>:

    Internal change

186843458  by karmel<karmel@google.com>:

    Internal change

186348279  by karmel<karmel@google.com>:

    Internal change

186323602  by ashankar<ashankar@google.com>:

    Internal change

185051452  by wun<wun@google.com>:

    Internal change

185039308  by wun<wun@google.com>:

    Internal change

184934877  by wun<wun@google.com>:

    Internal change

184876413  by wun<wun@google.com>:

    Internal change

184868771  by wun<wun@google.com>:

    Internal change

184751017  by wun<wun@google.com>:

    Internal change

184743769  by wun<wun@google.com>:

    Internal change

183894402  by frankchn<frankchn@google.com>:

    Internal change

183863555  by frankchn<frankchn@google.com>:

    Internal change

183249343  by karmel<karmel@google.com>:

    Internal change

183099733  by wun<wun@google.com>:

    Internal change

182981253  by wun<wun@google.com>:

    Internal change

182977703  by wun<wun@google.com>:

    Internal change

182414330  by ashankar<ashankar@google.com>:

    Internal change

182069924  by wun<wun@google.com>:

    Internal change

181544879  by ashankar<ashankar@google.com>:

    Internal change

180618064  by ashankar<ashankar@google.com>:

    Internal change

180591779  by ashankar<ashankar@google.com>:

    Internal change

179724765  by kathywu<kathywu@google.com>:

    Internal change

179713599  by kathywu<kathywu@google.com>:

    Internal change

179110125  by wun<wun@google.com>:

    Internal change

178793339  by kathywu<kathywu@google.com>:

    Internal change

176581733  by wun<wun@google.com>:

    Internal change

175220569  by wun<wun@google.com>:

    Internal change

175183195  by wun<wun@google.com>:

    Internal change

175171381  by wun<wun@google.com>:

    Internal change

175036833  by wun<wun@google.com>:

    Internal change

175031858  by wun<wun@google.com>:

    Internal change

174891336  by wun<wun@google.com>:

    Internal change

174881248  by kathywu<kathywu@google.com>:

    Internal change

174766157  by wun<wun@google.com>:

    Internal change

173723629  by wun<wun@google.com>:

    Internal change

173579695  by wun<wun@google.com>:

    Internal change

173443901  by wun<wun@google.com>:

    Internal change

173340656  by wun<wun@google.com>:

    Internal change

172954249  by wun<wun@google.com>:

    Internal change

172926654  by wun<wun@google.com>:

    Internal change

172922540  by wun<wun@google.com>:

    Internal change

172921684  by kathywu<kathywu@google.com>:

    Internal change

170943723  by wun<wun@google.com>:

    Internal change

170927898  by wun<wun@google.com>:

    Internal change

170430173  by wun<wun@google.com>:

    Internal change

170428312  by wun<wun@google.com>:

    Internal change

PiperOrigin-RevId: 249218656

* Revert "Merged commit includes the following changes:"

This reverts commit e30d805d3770d7473166dcca1ecb6050dc5de47a.

* Merged commit includes the following changes:

PiperOrigin-RevId: 249232280

* Merged commit includes the following changes:
249376444  by tianlin<tianlin@google.com>:

    Internal change

249373328  by hongkuny<hongkuny@google.com>:

    Clean up tf import

--
249340512  by hongkuny<hongkuny@google.com>:

    Internal change

249325089  by hongkuny<hongkuny@google.com>:

    BERT 2.0

--
249260134  by tianlin<tianlin@google.com>:

    Internal change

PiperOrigin-RevId: 249376444

* Fixed absl_app in official/mnist/mnist_tpu.py

* Make metrics in order (switch from dict to list of tuples).

* Revert ResNet Model to an earlier version.

* Fix lint format.

* Disable two tests in v2.

* Add FP16 and benchmarks.

* add missing run and report.

* Add loss_scale as option not included with dtype.

* move loss_scale validation under dtype conditional.

* add loss_scale to flags tested.

* Add first benchmark and return stats.

* Remove print statements update training steps.

* Revert print T: in print statement.

* Remove print(stats)

* add 2 gpu accuracy test for base.

* Fixed total_batch_size when using gpu + gFile deprecations.

* 8 GPU test name fix

* Add 4 and 8 GPU tests.

* typo fixes.

* Clean up test names and methods.

* bleu uncased.  docstring format fix.

Replace per_device with per_replica and PerDevice with PerReplica, because the PerDevice concept was renamed and doesn't exist anymore. (#6693)

* Replace per_device with per_replica and PerDevice with PerReplica, because the PerReplica concept was renamed and doesn't exist anymore.

* Update README.md

* Update README.md

* Update README.md

* Add a flag to specify distribution strategies.

* Fix a small error.

* Address comments.

* Address comments.

* Fix typos.

It currently fails with
TypeError: not all arguments converted during string formatting

For tf2 this will only be available in `compat.v1`.

Explicitly pass values kwarg to tf.name_scope as it is currently being treated as the default_name kwarg instead. This causes an exception to be thrown in eager mode.

* set strip_default_attrs=True for SavedModel exports

* specify dtype in resnet export

* another dtype fix

* fix another dtype issue, and set --image_bytes_as_serving_input to default to False

Bypassing Export model step, if training on TPU's. As this need inference to be supported on TPU's. Remove this check once inference is supported. (#5209)

Bypassing Export model step, if training on TPU's. As this need inference to be supported on TPU's. Remove this check once inference is supported.

* Deterministic dataset order fix

In order for the order of the files to be deterministic, in `tf.data.Dataset.list_files(..., shuffle)`, shuffle needs to be True, otherwise different iterator inits will yield different file orders

* removed unnecessary shuffle of filenames

* Removed the `_FILE_SHUFFLE_BUFFER` definition

* Fix Transformer TPU crash in Python 2.X.

- Tensorflow raises an error when tf_inspect.getfullargspec is called on
a functools.partial in Python 2.X. This issue would be hit during the
eval stage of the Transformer TPU model. This change replaces the call
to functools.partial with a lambda to work around the issue.

* Remove unused import from transformer_main.

* Fix lint error.

* fix batch_size in transformer_main.py

fix batch_size in transformer_main.py which causes ResourceExhaustedError: OOM during training Transformer models using models/official/transformer

* small format change

change format from one line to multiple ones in order to pass lint tests

* remove trailing space and add comment

* Use six and feature detection in string conversion

Leverage [__six.ensure_text()__](https://github.com/benjaminp/six/blob/master/six.py#L890) to deliver Unicode text in both Python 2 and Python 3.

Follow Python porting best practice [use feature detection instead of version detection](https://docs.python.org/3/howto/pyporting.html#use-feature-detection-instead-of-version-detection) in ___unicode_to_native()__.

* Revert the use of six.ensure_text()

Thanks for catching that!  I jumped the gun.  It is I who have brought shame...

* begin branch

* finish download script

* rename download to dataset

* intermediate commit

* intermediate commit

* misc tweaks

* intermediate commit

* intermediate commit

* intermediate commit

* delint and update census test.

* add movie tests

* delint

* fix py2 issue

* address PR comments

* intermediate commit

* intermediate commit

* intermediate commit

* finish wide deep transition to vanilla movielens

* delint

* intermediate commit

* intermediate commit

* intermediate commit

* intermediate commit

* fix import

* add default ncf csv construction

* change default on download_if_missing

* shard and vectorize example serialization

* fix import

* update ncf data unittests

* delint

* delint

* more delinting

* fix wide-deep movielens serialization

* address PR comments

* add file_io tests

* investigate wide-deep test failure

* remove hard coded path and properly...

* remove unused imports and lint

* fix schedule.py

* address PR comments

* Add checklist for official models. Remove file access from flag validator (causing issues with BUILD)

* spelling

* address PR comments

* Add DistributionStrategy to transformer model

* add num_gpu flag

* Calculate per device batch size for transformer

* remove reference to flags_core

* Add synthetic data option to transformer

* fix typo

* add import back in

* Use hierarchical copy

* address PR comments

* lint

* fix spaces

* group train op together to fix single GPU error

* Fix translate bug (sorted_keys is a dict, not a list)

* Change params to a default dict (translate.py was throwing errors because params didn't have the TPU parameters.)

* Address PR comments. Removed multi gpu flag + more

* fix lint

* fix more lints

* add todo for Synthetic dataset

* Update docs

* add tests for matmul embedding and schedule manager, as well as some minor cleanup

* delint

* address PR comments

* port changes from previous branch now that transformer util changes are in master

fix incorrect count

correct (hopefully) treatment of batch_size

set eval_metrics to a dummy function for now

add some comments

start bringing metrics to transformer TPU

resolve logits shape

metrics are now working except for tf.py_func metrics

increase batch_size for tpu, and create summary host call

fix host call

reduce tpu default batch size

further tune batch sizes

add minibatch loss to summary

handle case of single_iteration_train_steps > number points in an epoch

begin to incorporate hooks

add sleep workarounds

disable hooks altogether

generalize host call function and move to newly created tpu utils module

remove all traces of params as an object

switch from  to

address some PR comments, and change the number of data points.

minor tweaks

add tpu dry run for testing, and use matmul for TPU embedding

infeed/outfeed queue issue is fixed. Sleeps are no longer necessary

add some documentation.

cleanup and address PR comments

delint

add accelerator __init__

fix embedding

missed PR comment

address PR comments

fix validator bug

rewrite cloud storage validator, and add oauth dependency to requirements.txt

* delint

* Add new test ID and test env info to the benchmark run.

* Fix test.

* Fix lint

* Address review comment.

* Update benchmark logger to update the run status.

This is important for streaming upload to bigquery so that the
dashboard can ignore the 'running' benchmark at the moment since
its not finished yet.

* Move the run status into a separate table.

Also update the run status in the benchmark uploader and
BigqueryBenchmarkLogger.

* Insert instead of update for the benchmark status for file logger.

* Address review comments.

Update the logger to have benchmark context, which will update the
run status accordingly.

* Fix broken tests.

* Move the benchmark logger context to main function.

* Fix tests.

* Update the rest of the models to use the context in main.

* Delint.

* Update the wide_deep code for latest benchmark config.

* Also update the transformer benchmark code.