Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pytorch_pretrained_bert/optimization.py

pytorch_pretrained_bert/__init__.py

@@ -18,7 +18,7 @@ from .modeling_gpt2 import (GPT2Config, GPT2Model,
                             GPT2LMHeadModel, GPT2DoubleHeadsModel,
                             load_tf_weights_in_gpt2)
 
-from .optimization import BertAdam
+from .optimization import *
 from .optimization_openai import OpenAIAdam
 
 from .file_utils import PYTORCH_PRETRAINED_BERT_CACHE, cached_path

pytorch_pretrained_bert/optimization.py

@@ -26,7 +26,6 @@ logger = logging.getLogger(__name__)
 def warmup_cosine(x, warmup=0.002):
     if x < warmup:
         return x/warmup
-
     x_ = (x - warmup) / (1 - warmup)  # progress after warmup
     return 0.5 * (1. + math.cos(math.pi * x_))