From 45edd374fbb67670982e4d26f9e4fc6c1b101008 Mon Sep 17 00:00:00 2001 From: Adam Letts Date: Tue, 5 Apr 2022 21:10:41 -0400 Subject: [PATCH] Fix disco_xform_utils import --- Disco_Diffusion.ipynb | 6 ++++-- disco.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Disco_Diffusion.ipynb b/Disco_Diffusion.ipynb index d6e9673..2f1197e 100644 --- a/Disco_Diffusion.ipynb +++ b/Disco_Diffusion.ipynb @@ -515,12 +515,14 @@ " sys.path.append(f'{PROJECT_DIR}/MiDaS')\n", "\n", "try:\n", - " sys.path.append(f'{PROJECT_DIR}/disco-diffusion')\n", + " sys.path.append(PROJECT_DIR)\n", " import disco_xform_utils as dxf\n", "except:\n", " if not os.path.exists(\"disco-diffusion\"):\n", " gitclone(\"https://github.com/alembics/disco-diffusion.git\")\n", - " sys.path.append(f'{PROJECT_DIR}/disco-diffusion')\n", + " if os.path.exists('disco_xform_utils.py') is not True:\n", + " shutil.move('disco-diffusion/disco_xform_utils.py', 'disco_xform_utils.py')\n", + " sys.path.append(PROJECT_DIR)\n", "\n", "import torch\n", "from dataclasses import dataclass\n", diff --git a/disco.py b/disco.py index 7087b75..4095f6a 100644 --- a/disco.py +++ b/disco.py @@ -487,12 +487,14 @@ except: sys.path.append(f'{PROJECT_DIR}/MiDaS') try: - sys.path.append(f'{PROJECT_DIR}/disco-diffusion') + sys.path.append(PROJECT_DIR) import disco_xform_utils as dxf except: if not os.path.exists("disco-diffusion"): gitclone("https://github.com/alembics/disco-diffusion.git") - sys.path.append(f'{PROJECT_DIR}/disco-diffusion') + if os.path.exists('disco_xform_utils.py') is not True: + shutil.move('disco-diffusion/disco_xform_utils.py', 'disco_xform_utils.py') + sys.path.append(PROJECT_DIR) import torch from dataclasses import dataclass