Fix import of CLIP

pull/31/head
Adam Letts 3 years ago
parent a3e0d1f6b4
commit 0a62f25e76
  1. 4
      Disco_Diffusion.ipynb
  2. 4
      disco.py

@ -472,7 +472,7 @@
" subprocess.run(['apt', 'install', 'imagemagick'], stdout=subprocess.PIPE).stdout.decode('utf-8')\n", " subprocess.run(['apt', 'install', 'imagemagick'], stdout=subprocess.PIPE).stdout.decode('utf-8')\n",
"\n", "\n",
"try:\n", "try:\n",
" import CLIP\n", " from CLIP import clip\n",
"except:\n", "except:\n",
" if os.path.exists(\"CLIP\") is not True:\n", " if os.path.exists(\"CLIP\") is not True:\n",
" gitclone(\"https://github.com/openai/CLIP\")\n", " gitclone(\"https://github.com/openai/CLIP\")\n",
@ -542,7 +542,7 @@
"import torchvision.transforms as T\n", "import torchvision.transforms as T\n",
"import torchvision.transforms.functional as TF\n", "import torchvision.transforms.functional as TF\n",
"from tqdm.notebook import tqdm\n", "from tqdm.notebook import tqdm\n",
"import CLIP\n", "from CLIP import clip\n",
"from resize_right import resize\n", "from resize_right import resize\n",
"from guided_diffusion.script_util import create_model_and_diffusion, model_and_diffusion_defaults\n", "from guided_diffusion.script_util import create_model_and_diffusion, model_and_diffusion_defaults\n",
"from datetime import datetime\n", "from datetime import datetime\n",

@ -448,7 +448,7 @@ if is_colab:
subprocess.run(['apt', 'install', 'imagemagick'], stdout=subprocess.PIPE).stdout.decode('utf-8') subprocess.run(['apt', 'install', 'imagemagick'], stdout=subprocess.PIPE).stdout.decode('utf-8')
try: try:
import CLIP from CLIP import clip
except: except:
if os.path.exists("CLIP") is not True: if os.path.exists("CLIP") is not True:
gitclone("https://github.com/openai/CLIP") gitclone("https://github.com/openai/CLIP")
@ -518,7 +518,7 @@ from torch.nn import functional as F
import torchvision.transforms as T import torchvision.transforms as T
import torchvision.transforms.functional as TF import torchvision.transforms.functional as TF
from tqdm.notebook import tqdm from tqdm.notebook import tqdm
import CLIP from CLIP import clip
from resize_right import resize from resize_right import resize
from guided_diffusion.script_util import create_model_and_diffusion, model_and_diffusion_defaults from guided_diffusion.script_util import create_model_and_diffusion, model_and_diffusion_defaults
from datetime import datetime from datetime import datetime

Loading…
Cancel
Save