From b3e79fea97bf67ae0e569844a682317005b6ba32 Mon Sep 17 00:00:00 2001
From: qiushuo <qiushuo@microsoft.com>
Date: Wed, 1 Jun 2022 09:33:31 +0800
Subject: [PATCH 1/3] fix docker build fails

---
 Dockerfile | 10 +++-------
 setup.py   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e49d9d220..84ce1892c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN mkdir -p /build
 WORKDIR /build
 
-# Fix for https://github.com/NVIDIA/nvidia-docker/issues/1631
-RUN rm /etc/apt/sources.list.d/cuda.list
-RUN rm /etc/apt/sources.list.d/nvidia-ml.list
 RUN apt-key del 7fa2af80 && \
     apt-get -qq update && \
     apt-get -qq install -y --no-install-recommends curl && \
@@ -32,7 +29,7 @@ RUN pip3 install -v --no-cache-dir --global-option="--cpp_ext" --global-option="
 # Install Megatron-LM branch
 WORKDIR /build
 
-RUN git clone --branch fairseq_v2 https://github.git adcom/ngoyal2707/Megatron-LM.git
+RUN git clone --branch fairseq_v2 https://github.com/ngoyal2707/Megatron-LM.git
 WORKDIR /build/Megatron-LM
 RUN pip3 install six regex
 RUN pip3 install -e .
@@ -40,14 +37,13 @@ RUN pip3 install -e .
 # Install Fairscale
 WORKDIR /build
 
-RUN git clone https://github.com/facebookresearch/fairscale.git
+RUN git clone --branch prefetch_fsdp_params_simple https://github.com/facebookresearch/fairscale.git
 WORKDIR /build/fairscale
-RUN git checkout prefetch_fsdp_params_simple
 RUN pip3 install -e .
 
 # Install metaseq
 WORKDIR /build
-RUN git clone https://github.com/facebookresearch/metaseq.git
+RUN git clone --branch dockerfilefix https://github.com/QIU-Shuo/metaseq.git
 WORKDIR /build/metaseq
 RUN pip3 install -e .
 RUN python3 setup.py install
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 918181c16..902d4acf4 100644
--- a/setup.py
+++ b/setup.py
@@ -155,7 +155,7 @@ def do_setup(package_data):
             "mypy",
             "ninja",
             'numpy; python_version>="3.7"',
-            "omegaconf==2.1.1",
+            "omegaconf<=2.1.1",
             "pre-commit",
             "pytest",
             "regex",

From 85232ad2d50a8f32c978bd8d25ae77614df85901 Mon Sep 17 00:00:00 2001
From: qiushuo <qiushuo@microsoft.com>
Date: Wed, 1 Jun 2022 09:36:16 +0800
Subject: [PATCH 2/3] revert metaseq branch tomain in dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 84ce1892c..3b7e5a1de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ RUN pip3 install -e .
 
 # Install metaseq
 WORKDIR /build
-RUN git clone --branch dockerfilefix https://github.com/QIU-Shuo/metaseq.git
+RUN git clone https://github.com/facebookresearch/metaseq.git
 WORKDIR /build/metaseq
 RUN pip3 install -e .
 RUN python3 setup.py install
\ No newline at end of file

From a4a444b7ca09b8f38929546cfb09917c5822b6c2 Mon Sep 17 00:00:00 2001
From: qiushuo <qiushuo@microsoft.com>
Date: Wed, 1 Jun 2022 09:47:26 +0800
Subject: [PATCH 3/3] limit max version of hydra-core

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 902d4acf4..cb5bdf15c 100644
--- a/setup.py
+++ b/setup.py
@@ -145,7 +145,7 @@ def do_setup(package_data):
             "editdistance",
             "fire",
             "flask==2.1.1",  # for api
-            "hydra-core>=1.1.0",
+            "hydra-core>=1.1.0,<1.2",
             "iopath",
             "ipdb",
             "ipython",