rename nets unique

Author: kwotsin

examples/sngan_example.py

@@ -10,8 +10,8 @@
         dataset, batch_size=64, shuffle=True, num_workers=4)
 
     # Define models and optimizers
-    netG = sngan.ResNetGenerator32()
-    netD = sngan.ResNetDiscriminator32()
+    netG = sngan.SNGANGenerator32()
+    netD = sngan.SNGANDiscriminator32()
     optD = optim.Adam(netD.parameters(), 2e-4, betas=(0.0, 0.9))
     optG = optim.Adam(netG.parameters(), 2e-4, betas=(0.0, 0.9))
 

tests/nets/cgan_pd/test_cgan_pd_128.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.cgan_pd.cgan_pd_128 import ResNetGenerator128, ResNetDiscriminator128
+from torch_mimicry.nets.cgan_pd.cgan_pd_128 import CGANPDGenerator128, CGANPDDiscriminator128
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -22,9 +22,9 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator128(num_classes=self.num_classes,
+        self.netG = CGANPDGenerator128(num_classes=self.num_classes,
                                        ngf=self.ngf)
-        self.netD = ResNetDiscriminator128(num_classes=self.num_classes,
+        self.netD = CGANPDDiscriminator128(num_classes=self.num_classes,
                                            ndf=self.ndf)
 
     def test_ResNetGenerator128(self):

tests/nets/cgan_pd/test_cgan_pd_32.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.cgan_pd.cgan_pd_32 import ResNetGenerator32, ResNetDiscriminator32
+from torch_mimicry.nets.cgan_pd.cgan_pd_32 import CGANPDGenerator32, CGANPDDiscriminator32
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -22,9 +22,9 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator32(num_classes=self.num_classes,
+        self.netG = CGANPDGenerator32(num_classes=self.num_classes,
                                       ngf=self.ngf)
-        self.netD = ResNetDiscriminator32(num_classes=self.num_classes,
+        self.netD = CGANPDDiscriminator32(num_classes=self.num_classes,
                                           ndf=self.ndf)
 
     def test_ResNetGenerator32(self):

tests/nets/dcgan/test_dcgan_128.py

@@ -5,7 +5,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.dcgan.dcgan_128 import ResNetGenerator128, ResNetDiscriminator128
+from torch_mimicry.nets.dcgan.dcgan_128 import DCGANGenerator128, DCGANDiscriminator128
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -17,8 +17,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator128(ngf=self.ngf)
-        self.netD = ResNetDiscriminator128(ndf=self.ndf)
+        self.netG = DCGANGenerator128(ngf=self.ngf)
+        self.netD = DCGANDiscriminator128(ndf=self.ndf)
 
     def test_ResNetGenerator128(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/dcgan/test_dcgan_32.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.dcgan.dcgan_32 import ResNetGenerator32, ResNetDiscriminator32
+from torch_mimicry.nets.dcgan.dcgan_32 import DCGANGenerator32, DCGANDiscriminator32
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator32(ngf=self.ngf)
-        self.netD = ResNetDiscriminator32(ndf=self.ndf)
+        self.netG = DCGANGenerator32(ngf=self.ngf)
+        self.netD = DCGANDiscriminator32(ndf=self.ndf)
 
     def test_ResNetGenerator32(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/dcgan/test_dcgan_48.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.dcgan.dcgan_48 import ResNetGenerator48, ResNetDiscriminator48
+from torch_mimicry.nets.dcgan.dcgan_48 import DCGANGenerator48, DCGANDiscriminator48
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator48(ngf=self.ngf)
-        self.netD = ResNetDiscriminator48(ndf=self.ndf)
+        self.netG = DCGANGenerator48(ngf=self.ngf)
+        self.netD = DCGANDiscriminator48(ndf=self.ndf)
 
     def test_ResNetGenerator48(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/dcgan/test_dcgan_64.py

@@ -5,7 +5,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.dcgan.dcgan_64 import ResNetGenerator64, ResNetDiscriminator64
+from torch_mimicry.nets.dcgan.dcgan_64 import DCGANGenerator64, DCGANDiscriminator64
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -17,8 +17,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator64(ngf=self.ngf)
-        self.netD = ResNetDiscriminator64(ndf=self.ndf)
+        self.netG = DCGANGenerator64(ngf=self.ngf)
+        self.netD = DCGANDiscriminator64(ndf=self.ndf)
 
     def test_ResNetGenerator64(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/dcgan/test_dcgan_cifar.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.dcgan.dcgan_cifar import ResNetGeneratorCIFAR, ResNetDiscriminatorCIFAR
+from torch_mimicry.nets.dcgan.dcgan_cifar import DCGANGeneratorCIFAR, DCGANDiscriminatorCIFAR
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGeneratorCIFAR(ngf=self.ngf)
-        self.netD = ResNetDiscriminatorCIFAR(ndf=self.ndf)
+        self.netG = DCGANGeneratorCIFAR(ngf=self.ngf)
+        self.netD = DCGANDiscriminatorCIFAR(ndf=self.ndf)
 
     def test_ResNetGeneratorCIFAR(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/gan/test_cgan.py

@@ -1,10 +1,10 @@
 import torch
 import torch.nn as nn
 
-from torch_mimicry.nets.gan.cgan import BaseGenerator, BaseDiscriminator
+from torch_mimicry.nets.gan.cgan import BaseConditionalGenerator, BaseConditionalDiscriminator
 
 
-class ExampleGenerator(BaseGenerator):
+class ExampleGenerator(BaseConditionalGenerator):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.l1 = nn.Linear(1, 1)
@@ -13,7 +13,7 @@ def forward(self, x, y):
         return torch.ones(x.shape[0], 3, 32, 32)
 
 
-class ExampleDiscriminator(BaseDiscriminator):
+class ExampleDiscriminator(BaseConditionalDiscriminator):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.l1 = nn.Linear(1, 1)

tests/nets/infomax_gan/test_infomax_gan_128.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.infomax_gan.infomax_gan_128 import ResNetGenerator128, ResNetDiscriminator128
+from torch_mimicry.nets.infomax_gan.infomax_gan_128 import InfoMaxGANGenerator128, InfoMaxGANDiscriminator128
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator128(ngf=self.ngf)
-        self.netD = ResNetDiscriminator128(ndf=self.ndf)
+        self.netG = InfoMaxGANGenerator128(ngf=self.ngf)
+        self.netD = InfoMaxGANDiscriminator128(ndf=self.ndf)
 
     def test_ResNetGenerator128(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/infomax_gan/test_infomax_gan_32.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.infomax_gan.infomax_gan_32 import ResNetGenerator32, ResNetDiscriminator32
+from torch_mimicry.nets.infomax_gan.infomax_gan_32 import InfoMaxGANGenerator32, InfoMaxGANDiscriminator32
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator32(ngf=self.ngf)
-        self.netD = ResNetDiscriminator32(ndf=self.ndf)
+        self.netG = InfoMaxGANGenerator32(ngf=self.ngf)
+        self.netD = InfoMaxGANDiscriminator32(ndf=self.ndf)
 
     def test_ResNetGenerator32(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/infomax_gan/test_infomax_gan_48.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.infomax_gan.infomax_gan_48 import ResNetGenerator48, ResNetDiscriminator48
+from torch_mimicry.nets.infomax_gan.infomax_gan_48 import InfoMaxGANGenerator48, InfoMaxGANDiscriminator48
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator48(ngf=self.ngf)
-        self.netD = ResNetDiscriminator48(ndf=self.ndf)
+        self.netG = InfoMaxGANGenerator48(ngf=self.ngf)
+        self.netD = InfoMaxGANDiscriminator48(ndf=self.ndf)
 
     def test_ResNetGenerator48(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/infomax_gan/test_infomax_gan_64.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.infomax_gan.infomax_gan_64 import ResNetGenerator64, ResNetDiscriminator64
+from torch_mimicry.nets.infomax_gan.infomax_gan_64 import InfoMaxGANGenerator64, InfoMaxGANDiscriminator64
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator64(ngf=self.ngf)
-        self.netD = ResNetDiscriminator64(ndf=self.ndf)
+        self.netG = InfoMaxGANGenerator64(ngf=self.ngf)
+        self.netD = InfoMaxGANDiscriminator64(ndf=self.ndf)
 
     def test_ResNetGenerator64(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/sngan/test_sngan_128.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.sngan.sngan_128 import ResNetGenerator128, ResNetDiscriminator128
+from torch_mimicry.nets.sngan.sngan_128 import SNGANGenerator128, SNGANDiscriminator128
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator128(ngf=self.ngf)
-        self.netD = ResNetDiscriminator128(ndf=self.ndf)
+        self.netG = SNGANGenerator128(ngf=self.ngf)
+        self.netD = SNGANDiscriminator128(ndf=self.ndf)
 
     def test_ResNetGenerator128(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/sngan/test_sngan_32.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.sngan.sngan_32 import ResNetGenerator32, ResNetDiscriminator32
+from torch_mimicry.nets.sngan.sngan_32 import SNGANGenerator32, SNGANDiscriminator32
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator32(ngf=self.ngf)
-        self.netD = ResNetDiscriminator32(ndf=self.ndf)
+        self.netG = SNGANGenerator32(ngf=self.ngf)
+        self.netD = SNGANDiscriminator32(ndf=self.ndf)
 
     def test_ResNetGenerator32(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/sngan/test_sngan_48.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.sngan.sngan_48 import ResNetGenerator48, ResNetDiscriminator48
+from torch_mimicry.nets.sngan.sngan_48 import SNGANGenerator48, SNGANDiscriminator48
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator48(ngf=self.ngf)
-        self.netD = ResNetDiscriminator48(ndf=self.ndf)
+        self.netG = SNGANGenerator48(ngf=self.ngf)
+        self.netD = SNGANDiscriminator48(ndf=self.ndf)
 
     def test_ResNetGenerator48(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/sngan/test_sngan_64.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.sngan.sngan_64 import ResNetGenerator64, ResNetDiscriminator64
+from torch_mimicry.nets.sngan.sngan_64 import SNGANGenerator64, SNGANDiscriminator64
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator64(ngf=self.ngf)
-        self.netD = ResNetDiscriminator64(ndf=self.ndf)
+        self.netG = SNGANGenerator64(ngf=self.ngf)
+        self.netD = SNGANDiscriminator64(ndf=self.ndf)
 
     def test_ResNetGenerator64(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/ssgan/test_ssgan_128.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.ssgan.ssgan_128 import ResNetGenerator128, ResNetDiscriminator128
+from torch_mimicry.nets.ssgan.ssgan_128 import SSGANGenerator128, SSGANDiscriminator128
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -17,8 +17,8 @@ def setup(self):
         self.ndf = 16
         self.device = 'cpu'
 
-        self.netG = ResNetGenerator128(ngf=self.ngf)
-        self.netD = ResNetDiscriminator128(ndf=self.ndf)
+        self.netG = SSGANGenerator128(ngf=self.ngf)
+        self.netD = SSGANDiscriminator128(ndf=self.ndf)
 
     def test_ResNetGenerator128(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/ssgan/test_ssgan_32.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.ssgan.ssgan_32 import ResNetGenerator32, ResNetDiscriminator32
+from torch_mimicry.nets.ssgan.ssgan_32 import SSGANGenerator32, SSGANDiscriminator32
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator32(ngf=self.ngf)
-        self.netD = ResNetDiscriminator32(ndf=self.ndf)
+        self.netG = SSGANGenerator32(ngf=self.ngf)
+        self.netD = SSGANDiscriminator32(ndf=self.ndf)
 
     def test_ResNetGenerator32(self):
         noise = torch.ones(self.N, self.nz)

tests/nets/ssgan/test_ssgan_48.py

@@ -4,7 +4,7 @@
 import torch
 import torch.optim as optim
 
-from torch_mimicry.nets.ssgan.ssgan_48 import ResNetGenerator48, ResNetDiscriminator48
+from torch_mimicry.nets.ssgan.ssgan_48 import SSGANGenerator48, SSGANDiscriminator48
 from torch_mimicry.training import metric_log
 from torch_mimicry.utils import common
 
@@ -16,8 +16,8 @@ def setup(self):
         self.ngf = 16
         self.ndf = 16
 
-        self.netG = ResNetGenerator48(ngf=self.ngf)
-        self.netD = ResNetDiscriminator48(ndf=self.ndf)
+        self.netG = SSGANGenerator48(ngf=self.ngf)
+        self.netD = SSGANDiscriminator48(ndf=self.ndf)
 
     def test_ResNetGenerator48(self):
         noise = torch.ones(self.N, self.nz)