Merge pull request #37 from alembics/fix-disco-xform-utils-import-error

Fix disco_xform_utils import

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",

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