fixed some circular import in inference#206

neolaw84 wants to merge 4 commits intosczhou:mastersczhou/CodeFormer:masterfrom

neolaw84:masterneolaw84/CodeFormer:masterCopy head branch name to clipboard