resovle merge conflicts

31ca3b97 · Kaushik Shivakumar · 3e9d886d · 7fcd7cba · 31ca3b97 · 31ca3b97
Commit 31ca3b97 authored Jul 23, 2020 by Kaushik Shivakumar
20 changed files
--- a/official/nlp/tasks/electra_task_test.py
+++ b/official/nlp/tasks/electra_task_test.py
--- a/official/nlp/tasks/masked_lm.py
+++ b/official/nlp/tasks/masked_lm.py
--- a/official/nlp/tasks/masked_lm_test.py
+++ b/official/nlp/tasks/masked_lm_test.py
--- a/official/nlp/tasks/question_answering.py
+++ b/official/nlp/tasks/question_answering.py
--- a/official/nlp/tasks/question_answering_test.py
+++ b/official/nlp/tasks/question_answering_test.py
--- a/official/nlp/tasks/sentence_prediction.py
+++ b/official/nlp/tasks/sentence_prediction.py
--- a/official/nlp/tasks/sentence_prediction_test.py
+++ b/official/nlp/tasks/sentence_prediction_test.py
--- a/official/nlp/tasks/tagging.py
+++ b/official/nlp/tasks/tagging.py
--- a/official/nlp/tasks/tagging_test.py
+++ b/official/nlp/tasks/tagging_test.py
--- a/official/nlp/transformer/beam_search.py
+++ b/official/nlp/transformer/beam_search.py
--- a/official/nlp/transformer/beam_search_v1.py
+++ b/official/nlp/transformer/beam_search_v1.py
--- a/official/nlp/transformer/embedding_layer.py
+++ b/official/nlp/transformer/embedding_layer.py
--- a/official/nlp/transformer/optimizer.py
+++ b/official/nlp/transformer/optimizer.py
--- a/official/nlp/transformer/transformer.py
+++ b/official/nlp/transformer/transformer.py
--- a/official/nlp/transformer/transformer_main.py
+++ b/official/nlp/transformer/transformer_main.py
--- a/official/nlp/transformer/translate.py
+++ b/official/nlp/transformer/translate.py
--- a/official/nlp/transformer/utils/metrics.py
+++ b/official/nlp/transformer/utils/metrics.py
--- a/official/pip_package/setup.py
+++ b/official/pip_package/setup.py
--- a/official/recommendation/ncf_common.py
+++ b/official/recommendation/ncf_common.py
--- a/official/recommendation/ncf_input_pipeline.py
+++ b/official/recommendation/ncf_input_pipeline.py