Fixing merge conflict

458d7785 · rprenger · d7bf1ab5 · 9c5a830f · 458d7785 · 458d7785
Commit 458d7785 authored Feb 23, 2022 by rprenger
20 changed files
--- a/megatron/mpu/random.py
+++ b/megatron/mpu/random.py
--- a/megatron/optimizer/__init__.py
+++ b/megatron/optimizer/__init__.py
--- a/megatron/learning_rates.py
+++ b/megatron/learning_rates.py
--- a/megatron/p2p_communication.py
+++ b/megatron/p2p_communication.py
--- a/megatron/schedules.py
+++ b/megatron/schedules.py
--- a/megatron/static/index.html
+++ b/megatron/static/index.html
--- a/megatron/text_generation/api.py
+++ b/megatron/text_generation/api.py
--- a/megatron/text_generation/generation.py
+++ b/megatron/text_generation/generation.py
--- a/megatron/text_generation_server.py
+++ b/megatron/text_generation_server.py
--- a/megatron/training.py
+++ b/megatron/training.py
--- a/megatron/utils.py
+++ b/megatron/utils.py
--- a/pretrain_vit.py
+++ b/pretrain_vit.py
--- a/pretrain_vision_dino.py
+++ b/pretrain_vision_dino.py
--- a/pretrain_vision_inpaint.py
+++ b/pretrain_vision_inpaint.py
--- a/tasks/finetune_utils.py
+++ b/tasks/finetune_utils.py
--- a/tasks/msdp/README.md
+++ b/tasks/msdp/README.md
--- a/tasks/msdp/evaluate.py
+++ b/tasks/msdp/evaluate.py
--- a/tasks/msdp/main.py
+++ b/tasks/msdp/main.py
--- a/tasks/msdp/metrics.py
+++ b/tasks/msdp/metrics.py
--- a/tasks/msdp/preprocessing.py
+++ b/tasks/msdp/preprocessing.py