From a2a2f18c8cf31dac359828d0f853320898e3c44c Mon Sep 17 00:00:00 2001
From: Vikaas Varma <vikaas.varma@gmail.com>
Date: Fri, 10 Nov 2023 17:34:29 +0000
Subject: [PATCH 1/3] Fixed pytorch_lightning rank_zero import bug

---
 .DS_Store                          | Bin 0 -> 8196 bytes
 annotator/.DS_Store                | Bin 0 -> 8196 bytes
 cldm/logger.py                     |   2 +-
 data/.DS_Store                     | Bin 0 -> 8196 bytes
 ldm/.DS_Store                      | Bin 0 -> 6148 bytes
 ldm/models/diffusion/ddpm.py       |   2 +-
 ldm/models/diffusion/ddpm_multi.py |   2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 annotator/.DS_Store
 create mode 100644 data/.DS_Store
 create mode 100644 ldm/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a1866ee3e798ca9b52876cd62ada808300cb9430
GIT binary patch
literal 8196
zcmeHM&ubGw6n?WwB{hgSY4PIz1C>^)cwB45lTfIjf)Lv##?q`C+Eh?b1D*vB-W62T
zLq!q16;GlF9z2QYA0X<*|G;m4WcN*W)_Aj!nX>c3e(%lq=G)nweOn?D^PA0CqA4P(
z;E=XfMdxS|mq)Gz=FA+dKs-^8mT)Ar-f8E&{RyvtSHLUa74Qmp1$Kf0*t2D;6zuyN
z^}ScXD=?M{$mc_dL)ysLzP9SoflieGuw|T94Zl$bsF={$$k@KNDimYt>Oq)LVM+|4
z!-0p=9X2wyudNOzp~FcSW??E6q1X`@Dt8i*w!ZfYcm?tb$l84pRr?kECA@y0U0g}x
zt_rw$_K4dnPU`jLPO=QNvi<$x`Gs3=j~971|IxF1nK3_$FdUVTUzfU_Hba6FS2Kj?
zaXPs+ZSpX2aguT8QHw9QEBPj9h1S5>qYaCbXpfC@-rDt)m&J2#w}-{AAAV)<cc@9R
z#V$U5278Ke?k5jYZiZ*GcHtIppq`p#aLVsDOBQea*8#<AFwXmB?Z!asG?vfUg<HI*
zUSMd<=@P9{+g3aHv2~kcocGwiM;Wh)<-9JO^9Dbo0dInJ-?Qdhy>rI!Dva}fIBM}4
zJk!~Qb6%>d^;L3Q-Muq!z-kcAxqmLbuTnH)%%c`xZ9&d+H~11<*(Nn8#;+!|sAJ8U
zf^$WFJeO}z9}jeQj>)gVC|@g2z3z8q+1YD>=-@}>XW=}r3$N0=hI}%mihS%mBG6D3
zd2B+no?4YHtdPSrGjunSxL@qab9?zZ&8=WuuG(mCJ70C*P9oD5ZJ=);<9PT^qIb1>
z$kpM+^E~u>YjACyo|%$=_q6hRAA%U`uSe@xf2&Zk0cEAGL+fw)Ympz%aeLzVAV=qz
zT**<sR-Wc1Qzkn`t)%BVCF}o_#ozzOND)6(ufX^zAj<W{`aI@sYU`W=vepi9T*M)p
z^y_P@LeNPUd0v&{u<1Vx@jEnFWNcqsAZY*LLxA;;;MfNW_G$Z#$?yNTc#by(OHaT5
Jt2Mq8yFY3(9}oZl

literal 0
HcmV?d00001

diff --git a/annotator/.DS_Store b/annotator/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e91ea095fe7f9347e4034ee5ad0f72c663c33728
GIT binary patch
literal 8196
zcmeHMJ!=#}7=Gt+2X_V~*cicL8?{kLY75tRB4QH=TG*)f;hlJwT`xIED)$$dpAfM3
zHwc2Ag{>giiRrYo^O=vEeP?%e&q73TChWY+ywA+@?6Y$_I~yVrTl2vt(K->eamcu~
zipo=DULK{=FfAL10{v+++T7_U)3k&P4Z(rnKyV;95F7{&{4EY(&6cHIvF__^sDlH+
zf&bD0`Fx0Q$QYZL>8KtZsMHn!v596?aK0u_5F-;~6Ehu=K@qwuqV6ip7DMRnXpamo
zHZjvtcPC*sAHpyTvqKSz9pgs|P9oMZ)WLz^K-mGgcW+XUCN!s6VgLS~=cY-w+nXdk
zw6$Md?p@t}@$QD3AJpd4G5<E8ex)ty(_`Aj-=WLgXklcQ<=j86SZ)WAv-=Sh{Ld(*
zecE&R>9pZDS<c_S=I~oY&hJNf_&YSB85}sIJ>|rNh6No*(BVOGJ)f>yJziw4s~+jm
zw?bnY(!kYp_5_+thU-XgS{*i<bC<I&UxY#F6g|aUNa2W#`>Gzf?2SuRIIiX7w$<Vt
zbDHGJmSJ6;X5LPrZ2+BxdGmD)buF@4uIa%WtI0v+O8f|iUu;XCnqZh<&J^y<=VPAZ
z+;=`&Zrhi8;LE$bk`^m;g1a+R_b35>VYa?L=fiLvtqc9dbE7mC*HedcbkPT?YZbcY
zm@oA+=WR8TYy1{jjTPf^rOVN-UNwI@P`is6^aQ$RxR=Ailec&OCA4}_T<7;M&lg^L
zk@>u;M>_hl4e95ZvOao<H3IX!aL>=*?JUD{&G*^|3(d70+~HsC<6Or@bsh3rLaBCO
zMW@!~{{L3>_y6hvLMAv69QfxQ5Y6sRcMF$c_SU5fl6&n4$0HoFNL;3)>Vir_WV_mq
zBier$;yg0B*u+dnWKjP2hXBu;0$-z+ujqVrT8?(sCH-;3vtB!Ixncch@8@CtS3i^A
GUi}2M$o=R5

literal 0
HcmV?d00001

diff --git a/cldm/logger.py b/cldm/logger.py
index 385eb31..bf5ae6c 100644
--- a/cldm/logger.py
+++ b/cldm/logger.py
@@ -15,7 +15,7 @@
 import torchvision
 from PIL import Image
 from pytorch_lightning.callbacks import Callback
-from pytorch_lightning.utilities.distributed import rank_zero_only
+from pytorch_lightning.utilities.rank_zero import rank_zero_only
 import pytorch_lightning as pl
 
 class ImageLogger(Callback):
diff --git a/data/.DS_Store b/data/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0930781d11010825bc1a57986dda00d0ad24fee9
GIT binary patch
literal 8196
zcmeHM&ubGw6n>MWCQU1?o^o91O%U3fCs|9pcq-;9+NKFfF>ymp!1@FCB6w4;9u+)@
z5sy8J=*@$7|A`(&Q2gG^WHT?jn_h|(oe4W{nfJ|nU%t2OW;R5mHb<=uq8brZaBy5*
zLYL7v&qt~i?8rKz!hGs=HX6H8e~?1@0q=l!z&qd_@D6wfPKyJ0W^=3LJoio3_uc{T
zz<=og-yZ@T977vp6ZNeFo!$Z<mN2Xv&R6*aF|aYTF*XqyG-akDnyJceF_f8(@xbCj
z8)FmAbW(Qnp)9kqI~1kav3{W8q(T#Y?;Y?Cq#fYBdx@I(M08K?-@iU_bN#4ZZ}y@l
z#wv7paB=JLmn$;gnwuYV-FE{=n5ubuG@^aMyZrjHn{#>J-n{Sf>bd=B%A1uJyvrY%
zcY$_khwk8WAehVJmon>eU;mzPJM&%kY=q!1e>40oYSVy*)D`^d(ofBwWL^I7{DaAN
zUmyoD{r1@i!LPQNe~~)04+jqDu6CkFZJ}f3##%PY)l+?!=*d{m^<_R%=v#?dUy-`-
zrzJEMevGFXSI79=!-+3;p39xi3cg~%e2az;Zrld%5T3}olyAMyM!7o9K1+0DtmkT)
zj}-dK&skrU_HeBZP%(}}-FJjL)i+$ROq{E6=To9F2Rpr*j>8I_)eo%m4Ae!qvieZk
z6Z%TUz1h60>ssy6q=sS**R?#1&{5iA9Tlh;ppxuagsRG`yKteAg>m)#4ii18wOmc}
za6(r>*KrAIMyTJsN~&Kkpe_gLYFuk48gtRpY95c4de_;<GJA)6MHBU$by0nOl}5Pw
z4xc9aX4Y{X%tr}5>WKCDcCro>&2lx~|6k32|9`Tiel_oaci>bxpi1>deG`)G-Z~|&
zfRO;lHV$r#i%ry1&@qI^^>!RF`NI(Bfz5?B#wH?z_Sato_~(D-uMqLPE%@iZzBvEk
F?hm&A@%8`!

literal 0
HcmV?d00001

diff --git a/ldm/.DS_Store b/ldm/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5d4f08313cf1854bfe336af9882d5caba74691d8
GIT binary patch
literal 6148
zcmeHKu};H44E41U1j^8n3EdAc^bbN6cBGChw4|a#qEv!T3}j>DE8r{GkoXFa_ys<J
z=R4Ep62b;T$d-IB@!4nRC5rEe$c$Inh-gSeF_f{lgW(I|dDfQn#Igr8yheU8nw*!#
zvgN6Uzsdl=yNEKH(iKg^_t$@`&lP2w&hl~wTYT_%e|U29d=$=S-_9==^>2f}H`=0t
zO5~nXPM1OM=<c;SU(bL2w9X%_QIwk+x_p8<qIa%iTk2S$j(MY!-Nk9!qh8C)?ZYP*
zjdkkPbbAH$3>+_9lZrB+3@8IX$pCsbOFZzXqcWfjC<AK-`2S#`jEP|7(fv9wxFY~C
zg4qeK-5v&L*#JxgE03^1j1L9+P$NeS<HKRM;+F_k9(_0&ml^9wW+NvQBReQ#ojaMt
zqmIgeG7vJ*_qRjt|Hs|u|1e1JlmTVnUol{!bdrwoNYYzd568XMLeHQq>{oeQhv34s
gV)$|^-iJDY-SP!65v)AI0@00tqd^B{;8z*=0P?tL_y7O^

literal 0
HcmV?d00001

diff --git a/ldm/models/diffusion/ddpm.py b/ldm/models/diffusion/ddpm.py
index 62dc7ea..7ce62a8 100644
--- a/ldm/models/diffusion/ddpm.py
+++ b/ldm/models/diffusion/ddpm.py
@@ -27,7 +27,7 @@
 import itertools
 from tqdm import tqdm
 from torchvision.utils import make_grid
-from pytorch_lightning.utilities.distributed import rank_zero_only
+from pytorch_lightning.utilities.rank_zero import rank_zero_only
 from omegaconf import ListConfig
 
 from ldm.util import log_txt_as_img, exists, default, ismap, isimage, mean_flat, count_params, instantiate_from_config
diff --git a/ldm/models/diffusion/ddpm_multi.py b/ldm/models/diffusion/ddpm_multi.py
index 516a65f..5bdcb15 100644
--- a/ldm/models/diffusion/ddpm_multi.py
+++ b/ldm/models/diffusion/ddpm_multi.py
@@ -27,7 +27,7 @@
 import itertools
 from tqdm import tqdm
 from torchvision.utils import make_grid
-from pytorch_lightning.utilities.distributed import rank_zero_only
+from pytorch_lightning.utilities.rank_zero import rank_zero_only
 from omegaconf import ListConfig
 
 from ldm.util import log_txt_as_img, exists, default, ismap, isimage, mean_flat, count_params, instantiate_from_config

From 8d2370a664a4cfc9806bd52f849f89060c8fc04d Mon Sep 17 00:00:00 2001
From: Vikaas Varma <vikaas.varma@gmail.com>
Date: Fri, 10 Nov 2023 17:36:43 +0000
Subject: [PATCH 2/3] Added .DS_Store

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 325e5fd..b970d55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ image_log/
 *.pt
 *.ckpt
 *.safetensors
+.DS_Store
 
 gradio_pose2image_private.py
 gradio_canny2image_private.py

From 8c7307c06b36732ae1e1c3b2a958c27a80940876 Mon Sep 17 00:00:00 2001
From: Vikaas Varma <vikaas.varma@gmail.com>
Date: Fri, 10 Nov 2023 17:44:54 +0000
Subject: [PATCH 3/3] Removed DS_Store

---
 .DS_Store           | Bin 8196 -> 0 bytes
 .gitignore          |   1 -
 annotator/.DS_Store | Bin 8196 -> 0 bytes
 data/.DS_Store      | Bin 8196 -> 0 bytes
 ldm/.DS_Store       | Bin 6148 -> 0 bytes
 5 files changed, 1 deletion(-)
 delete mode 100644 .DS_Store
 delete mode 100644 annotator/.DS_Store
 delete mode 100644 data/.DS_Store
 delete mode 100644 ldm/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index a1866ee3e798ca9b52876cd62ada808300cb9430..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM&ubGw6n?WwB{hgSY4PIz1C>^)cwB45lTfIjf)Lv##?q`C+Eh?b1D*vB-W62T
zLq!q16;GlF9z2QYA0X<*|G;m4WcN*W)_Aj!nX>c3e(%lq=G)nweOn?D^PA0CqA4P(
z;E=XfMdxS|mq)Gz=FA+dKs-^8mT)Ar-f8E&{RyvtSHLUa74Qmp1$Kf0*t2D;6zuyN
z^}ScXD=?M{$mc_dL)ysLzP9SoflieGuw|T94Zl$bsF={$$k@KNDimYt>Oq)LVM+|4
z!-0p=9X2wyudNOzp~FcSW??E6q1X`@Dt8i*w!ZfYcm?tb$l84pRr?kECA@y0U0g}x
zt_rw$_K4dnPU`jLPO=QNvi<$x`Gs3=j~971|IxF1nK3_$FdUVTUzfU_Hba6FS2Kj?
zaXPs+ZSpX2aguT8QHw9QEBPj9h1S5>qYaCbXpfC@-rDt)m&J2#w}-{AAAV)<cc@9R
z#V$U5278Ke?k5jYZiZ*GcHtIppq`p#aLVsDOBQea*8#<AFwXmB?Z!asG?vfUg<HI*
zUSMd<=@P9{+g3aHv2~kcocGwiM;Wh)<-9JO^9Dbo0dInJ-?Qdhy>rI!Dva}fIBM}4
zJk!~Qb6%>d^;L3Q-Muq!z-kcAxqmLbuTnH)%%c`xZ9&d+H~11<*(Nn8#;+!|sAJ8U
zf^$WFJeO}z9}jeQj>)gVC|@g2z3z8q+1YD>=-@}>XW=}r3$N0=hI}%mihS%mBG6D3
zd2B+no?4YHtdPSrGjunSxL@qab9?zZ&8=WuuG(mCJ70C*P9oD5ZJ=);<9PT^qIb1>
z$kpM+^E~u>YjACyo|%$=_q6hRAA%U`uSe@xf2&Zk0cEAGL+fw)Ympz%aeLzVAV=qz
zT**<sR-Wc1Qzkn`t)%BVCF}o_#ozzOND)6(ufX^zAj<W{`aI@sYU`W=vepi9T*M)p
z^y_P@LeNPUd0v&{u<1Vx@jEnFWNcqsAZY*LLxA;;;MfNW_G$Z#$?yNTc#by(OHaT5
Jt2Mq8yFY3(9}oZl

diff --git a/.gitignore b/.gitignore
index b970d55..325e5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ image_log/
 *.pt
 *.ckpt
 *.safetensors
-.DS_Store
 
 gradio_pose2image_private.py
 gradio_canny2image_private.py
diff --git a/annotator/.DS_Store b/annotator/.DS_Store
deleted file mode 100644
index e91ea095fe7f9347e4034ee5ad0f72c663c33728..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMJ!=#}7=Gt+2X_V~*cicL8?{kLY75tRB4QH=TG*)f;hlJwT`xIED)$$dpAfM3
zHwc2Ag{>giiRrYo^O=vEeP?%e&q73TChWY+ywA+@?6Y$_I~yVrTl2vt(K->eamcu~
zipo=DULK{=FfAL10{v+++T7_U)3k&P4Z(rnKyV;95F7{&{4EY(&6cHIvF__^sDlH+
zf&bD0`Fx0Q$QYZL>8KtZsMHn!v596?aK0u_5F-;~6Ehu=K@qwuqV6ip7DMRnXpamo
zHZjvtcPC*sAHpyTvqKSz9pgs|P9oMZ)WLz^K-mGgcW+XUCN!s6VgLS~=cY-w+nXdk
zw6$Md?p@t}@$QD3AJpd4G5<E8ex)ty(_`Aj-=WLgXklcQ<=j86SZ)WAv-=Sh{Ld(*
zecE&R>9pZDS<c_S=I~oY&hJNf_&YSB85}sIJ>|rNh6No*(BVOGJ)f>yJziw4s~+jm
zw?bnY(!kYp_5_+thU-XgS{*i<bC<I&UxY#F6g|aUNa2W#`>Gzf?2SuRIIiX7w$<Vt
zbDHGJmSJ6;X5LPrZ2+BxdGmD)buF@4uIa%WtI0v+O8f|iUu;XCnqZh<&J^y<=VPAZ
z+;=`&Zrhi8;LE$bk`^m;g1a+R_b35>VYa?L=fiLvtqc9dbE7mC*HedcbkPT?YZbcY
zm@oA+=WR8TYy1{jjTPf^rOVN-UNwI@P`is6^aQ$RxR=Ailec&OCA4}_T<7;M&lg^L
zk@>u;M>_hl4e95ZvOao<H3IX!aL>=*?JUD{&G*^|3(d70+~HsC<6Or@bsh3rLaBCO
zMW@!~{{L3>_y6hvLMAv69QfxQ5Y6sRcMF$c_SU5fl6&n4$0HoFNL;3)>Vir_WV_mq
zBier$;yg0B*u+dnWKjP2hXBu;0$-z+ujqVrT8?(sCH-;3vtB!Ixncch@8@CtS3i^A
GUi}2M$o=R5

diff --git a/data/.DS_Store b/data/.DS_Store
deleted file mode 100644
index 0930781d11010825bc1a57986dda00d0ad24fee9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM&ubGw6n>MWCQU1?o^o91O%U3fCs|9pcq-;9+NKFfF>ymp!1@FCB6w4;9u+)@
z5sy8J=*@$7|A`(&Q2gG^WHT?jn_h|(oe4W{nfJ|nU%t2OW;R5mHb<=uq8brZaBy5*
zLYL7v&qt~i?8rKz!hGs=HX6H8e~?1@0q=l!z&qd_@D6wfPKyJ0W^=3LJoio3_uc{T
zz<=og-yZ@T977vp6ZNeFo!$Z<mN2Xv&R6*aF|aYTF*XqyG-akDnyJceF_f8(@xbCj
z8)FmAbW(Qnp)9kqI~1kav3{W8q(T#Y?;Y?Cq#fYBdx@I(M08K?-@iU_bN#4ZZ}y@l
z#wv7paB=JLmn$;gnwuYV-FE{=n5ubuG@^aMyZrjHn{#>J-n{Sf>bd=B%A1uJyvrY%
zcY$_khwk8WAehVJmon>eU;mzPJM&%kY=q!1e>40oYSVy*)D`^d(ofBwWL^I7{DaAN
zUmyoD{r1@i!LPQNe~~)04+jqDu6CkFZJ}f3##%PY)l+?!=*d{m^<_R%=v#?dUy-`-
zrzJEMevGFXSI79=!-+3;p39xi3cg~%e2az;Zrld%5T3}olyAMyM!7o9K1+0DtmkT)
zj}-dK&skrU_HeBZP%(}}-FJjL)i+$ROq{E6=To9F2Rpr*j>8I_)eo%m4Ae!qvieZk
z6Z%TUz1h60>ssy6q=sS**R?#1&{5iA9Tlh;ppxuagsRG`yKteAg>m)#4ii18wOmc}
za6(r>*KrAIMyTJsN~&Kkpe_gLYFuk48gtRpY95c4de_;<GJA)6MHBU$by0nOl}5Pw
z4xc9aX4Y{X%tr}5>WKCDcCro>&2lx~|6k32|9`Tiel_oaci>bxpi1>deG`)G-Z~|&
zfRO;lHV$r#i%ry1&@qI^^>!RF`NI(Bfz5?B#wH?z_Sato_~(D-uMqLPE%@iZzBvEk
F?hm&A@%8`!

diff --git a/ldm/.DS_Store b/ldm/.DS_Store
deleted file mode 100644
index 5d4f08313cf1854bfe336af9882d5caba74691d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKu};H44E41U1j^8n3EdAc^bbN6cBGChw4|a#qEv!T3}j>DE8r{GkoXFa_ys<J
z=R4Ep62b;T$d-IB@!4nRC5rEe$c$Inh-gSeF_f{lgW(I|dDfQn#Igr8yheU8nw*!#
zvgN6Uzsdl=yNEKH(iKg^_t$@`&lP2w&hl~wTYT_%e|U29d=$=S-_9==^>2f}H`=0t
zO5~nXPM1OM=<c;SU(bL2w9X%_QIwk+x_p8<qIa%iTk2S$j(MY!-Nk9!qh8C)?ZYP*
zjdkkPbbAH$3>+_9lZrB+3@8IX$pCsbOFZzXqcWfjC<AK-`2S#`jEP|7(fv9wxFY~C
zg4qeK-5v&L*#JxgE03^1j1L9+P$NeS<HKRM;+F_k9(_0&ml^9wW+NvQBReQ#ojaMt
zqmIgeG7vJ*_qRjt|Hs|u|1e1JlmTVnUol{!bdrwoNYYzd568XMLeHQq>{oeQhv34s
gV)$|^-iJDY-SP!65v)AI0@00tqd^B{;8z*=0P?tL_y7O^