Move schedulers directory to networks (#132)

Warvito · web-flow · commit 4609f5c45d0c · 2022-12-05T23:46:24.000Z
Signed-off-by: Walter Hugo Lopez Pinaya &lt;ianonimato@hotmail.com&gt;

Signed-off-by: Walter Hugo Lopez Pinaya &lt;ianonimato@hotmail.com&gt;
diff --git a/generative/networks/schedulers/__init__.py b/generative/networks/schedulers/__init__.py
diff --git a/generative/networks/schedulers/ddim.py b/generative/networks/schedulers/ddim.py
diff --git a/generative/networks/schedulers/ddpm.py b/generative/networks/schedulers/ddpm.py
diff --git a/generative/networks/schedulers/pndm.py b/generative/networks/schedulers/pndm.py
diff --git a/tests/test_diffusion_inferer.py b/tests/test_diffusion_inferer.py
@@ -16,7 +16,7 @@
 
 from generative.inferers import DiffusionInferer
 from generative.networks.nets import DiffusionModelUNet
-from generative.schedulers import DDIMScheduler, DDPMScheduler
+from generative.networks.schedulers import DDIMScheduler, DDPMScheduler
 
 TEST_CASES = [
     [
diff --git a/tests/test_latent_diffusion_inferer.py b/tests/test_latent_diffusion_inferer.py
@@ -16,7 +16,7 @@
 
 from generative.inferers import LatentDiffusionInferer
 from generative.networks.nets import VQVAE, AutoencoderKL, DiffusionModelUNet
-from generative.schedulers import DDPMScheduler
+from generative.networks.schedulers import DDPMScheduler
 
 TEST_CASES = [
     [
diff --git a/tests/test_scheduler_ddim.py b/tests/test_scheduler_ddim.py
@@ -14,7 +14,7 @@
 import torch
 from parameterized import parameterized
 
-from generative.schedulers import DDIMScheduler
+from generative.networks.schedulers import DDIMScheduler
 
 TEST_2D_CASE = []
 for beta_schedule in ["linear", "scaled_linear"]:
diff --git a/tests/test_scheduler_ddpm.py b/tests/test_scheduler_ddpm.py
@@ -14,7 +14,7 @@
 import torch
 from parameterized import parameterized
 
-from generative.schedulers import DDPMScheduler
+from generative.networks.schedulers import DDPMScheduler
 
 TEST_2D_CASE = []
 for beta_schedule in ["linear", "scaled_linear"]:
diff --git a/tests/test_scheduler_pndm.py b/tests/test_scheduler_pndm.py
@@ -14,7 +14,7 @@
 import torch
 from parameterized import parameterized
 
-from generative.schedulers import PNDMScheduler
+from generative.networks.schedulers import PNDMScheduler
 
 TEST_2D_CASE = []
 for beta_schedule in ["linear", "scaled_linear"]:
diff --git a/tutorials/generative/2d_ddpm/2d_ddpm_compare_schedulers.ipynb b/tutorials/generative/2d_ddpm/2d_ddpm_compare_schedulers.ipynb
@@ -107,10 +107,11 @@
     "from monai.utils import first, set_determinism\n",
     "from tqdm import tqdm\n",
     "\n",
+    "from generative.inferers import DiffusionInferer\n",
+    "\n",
     "# TODO: Add right import reference after deployed\n",
     "from generative.networks.nets import DiffusionModelUNet\n",
-    "from generative.schedulers import DDIMScheduler, DDPMScheduler, PNDMScheduler\n",
-    "from generative.inferers import DiffusionInferer\n",
+    "from generative.networks.schedulers import DDIMScheduler, DDPMScheduler, PNDMScheduler\n",
     "\n",
     "print_config()"
    ]
@@ -1001,7 +1002,7 @@
    "formats": "ipynb,py:percent"
   },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -1015,7 +1016,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.8.12"
   }
  },
  "nbformat": 4,
diff --git a/tutorials/generative/2d_ddpm/2d_ddpm_compare_schedulers.py b/tutorials/generative/2d_ddpm/2d_ddpm_compare_schedulers.py
@@ -8,7 +8,7 @@
 #       format_version: '1.3'
 #       jupytext_version: 1.14.1
 #   kernelspec:
-#     display_name: Python 3 (ipykernel)
+#     display_name: Python 3
 #     language: python
 #     name: python3
 # ---
@@ -67,7 +67,7 @@
 
 # TODO: Add right import reference after deployed
 from generative.networks.nets import DiffusionModelUNet
-from generative.schedulers import DDIMScheduler, DDPMScheduler, PNDMScheduler
+from generative.networks.schedulers import DDIMScheduler, DDPMScheduler, PNDMScheduler
 
 print_config()
 
diff --git a/tutorials/generative/2d_ddpm/2d_ddpm_tutorial.ipynb b/tutorials/generative/2d_ddpm/2d_ddpm_tutorial.ipynb
@@ -106,14 +106,14 @@
     "from monai.config import print_config\n",
     "from monai.data import CacheDataset, DataLoader\n",
     "from monai.utils import first, set_determinism\n",
-    "from tqdm import tqdm\n",
     "from torch.cuda.amp import GradScaler, autocast\n",
+    "from tqdm import tqdm\n",
     "\n",
     "from generative.inferers import DiffusionInferer\n",
     "\n",
     "# TODO: Add right import reference after deployed\n",
     "from generative.networks.nets import DiffusionModelUNet\n",
-    "from generative.schedulers import DDPMScheduler\n",
+    "from generative.networks.schedulers import DDPMScheduler\n",
     "\n",
     "print_config()"
    ]
diff --git a/tutorials/generative/2d_ddpm/2d_ddpm_tutorial.py b/tutorials/generative/2d_ddpm/2d_ddpm_tutorial.py
@@ -65,7 +65,7 @@
 
 # TODO: Add right import reference after deployed
 from generative.networks.nets import DiffusionModelUNet
-from generative.schedulers import DDPMScheduler
+from generative.networks.schedulers import DDPMScheduler
 
 print_config()
 
diff --git a/tutorials/generative/2d_ddpm/2d_ddpm_tutorial_ignite.ipynb b/tutorials/generative/2d_ddpm/2d_ddpm_tutorial_ignite.ipynb
@@ -115,7 +115,7 @@
     "\n",
     "# TODO: Add right import reference after deployed\n",
     "from generative.networks.nets import DiffusionModelUNet\n",
-    "from generative.schedulers import DDPMScheduler\n",
+    "from generative.networks.schedulers import DDPMScheduler\n",
     "\n",
     "print_config()"
    ]
@@ -418,6 +418,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "\n",
+    "\n",
     "class DiffusionPrepareBatch(PrepareBatch):\n",
     "    \"\"\"\n",
     "    This class is used as a callable for the `prepare_batch` parameter of engine classes for diffusion training.\n",
diff --git a/tutorials/generative/2d_ddpm/2d_ddpm_tutorial_ignite.py b/tutorials/generative/2d_ddpm/2d_ddpm_tutorial_ignite.py
@@ -67,7 +67,7 @@
 
 # TODO: Add right import reference after deployed
 from generative.networks.nets import DiffusionModelUNet
-from generative.schedulers import DDPMScheduler
+from generative.networks.schedulers import DDPMScheduler
 
 print_config()
 
diff --git a/tutorials/generative/2d_ldm/2d_ldm_tutorial.ipynb b/tutorials/generative/2d_ldm/2d_ldm_tutorial.ipynb
@@ -115,7 +115,7 @@
     "from generative.losses.adversarial_loss import PatchAdversarialLoss\n",
     "from generative.losses.perceptual import PerceptualLoss\n",
     "from generative.networks.nets import AutoencoderKL, DiffusionModelUNet, PatchDiscriminator\n",
-    "from generative.schedulers import DDPMScheduler\n",
+    "from generative.networks.schedulers import DDPMScheduler\n",
     "\n",
     "print_config()"
    ]
@@ -1579,7 +1579,7 @@
    "main_language": "python"
   },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -1593,7 +1593,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.15"
+   "version": "3.8.12"
   }
  },
  "nbformat": 4,
diff --git a/tutorials/generative/2d_ldm/2d_ldm_tutorial.py b/tutorials/generative/2d_ldm/2d_ldm_tutorial.py
@@ -1,3 +1,19 @@
+# ---
+# jupyter:
+#   jupytext:
+#     cell_metadata_filter: -all
+#     formats: ipynb,py
+#     text_representation:
+#       extension: .py
+#       format_name: light
+#       format_version: '1.5'
+#       jupytext_version: 1.14.1
+#   kernelspec:
+#     display_name: Python 3
+#     language: python
+#     name: python3
+# ---
+
 # # 2D Latent Diffusion Model
 
 # +
@@ -34,7 +50,7 @@
 from generative.losses.adversarial_loss import PatchAdversarialLoss
 from generative.losses.perceptual import PerceptualLoss
 from generative.networks.nets import AutoencoderKL, DiffusionModelUNet, PatchDiscriminator
-from generative.schedulers import DDPMScheduler
+from generative.networks.schedulers import DDPMScheduler
 
 print_config()
 # -
diff --git a/tutorials/generative/3d_ddpm/3d_ddpm_tutorial.ipynb b/tutorials/generative/3d_ddpm/3d_ddpm_tutorial.ipynb
@@ -108,7 +108,7 @@
     "\n",
     "# TODO: Add right import reference after deployed\n",
     "from generative.networks.nets import DiffusionModelUNet\n",
-    "from generative.schedulers import DDPMScheduler\n",
+    "from generative.networks.schedulers import DDPMScheduler\n",
     "\n",
     "print_config()"
    ]
diff --git a/tutorials/generative/3d_ddpm/3d_ddpm_tutorial.py b/tutorials/generative/3d_ddpm/3d_ddpm_tutorial.py
@@ -64,7 +64,7 @@
 
 # TODO: Add right import reference after deployed
 from generative.networks.nets import DiffusionModelUNet
-from generative.schedulers import DDPMScheduler
+from generative.networks.schedulers import DDPMScheduler
 
 print_config()
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`from generative.inferers import DiffusionInferer`
`18`	`18`	`from generative.networks.nets import DiffusionModelUNet`
`19`		`-from generative.schedulers import DDIMScheduler, DDPMScheduler`
	`19`	`+from generative.networks.schedulers import DDIMScheduler, DDPMScheduler`
`20`	`20`
`21`	`21`	`TEST_CASES = [`
`22`	`22`	`[`