refactor

maximkm · Aug 31, 2021 · 8d62bd8 · 8d62bd8
1 parent fd61f77
commit 8d62bd8
Show file tree

Hide file tree

Showing 162 changed files with 17 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -59,13 +59,13 @@ For more detailed information on configuring configs, see the wiki page [configu
 
 ## Examples of generation
 
-Many launches were conducted for the selection of hyperparameters and testing, the result of training one of the StyleGAN launches with a resolution of 64x64 after 1 day of training on 1 x Tesla V100, on a dataset of 20k images with a resolution of 64x64, is shown below.
+Many launches were conducted for the selection of hyperparameters and testing, the result of training one of the StyleGAN launches with a resolution of 64x64 after 1 day of training on 4 x Tesla V100, on a dataset of 20k images with a resolution of 64x64, is shown below.
 
-<img src="img/64x64 ex1.png" alt="StyleGAN 64" width="700"/>
+<img src="img/64x64 ex1.png" alt="StyleGAN 64" width="900"/>
 
 Also, the result of training the StyleGAN model for a resolution of 256x256, which was trained for 1.5 days on a 4 x Tesla V100, on a dataset of 92k images with a resolution of 256x256, is shown below:
 
-<img src="img/256x256 ex1.png" alt="StyleGAN 256" width="700"/>
+<img src="img/256x256 ex1.png" alt="StyleGAN 256" width="900"/>
 
 The images are obtained by denormalization, so their saturation can be adjusted
 
@@ -91,13 +91,13 @@ SaveImages(Trainer, dir='img', cnt=10)
 Example of creating a video using the example of interpolation between two images:
 
 ```python
-from utils.video import generate_video
+from utils.video import GenerateVideo
 
-samples = from_to_video(z_1, z_2)  # A tensor consisting of image frames
-generate_video(samples)
+samples = FromToVideo(z_1, z_2)  # A tensor consisting of image frames
+GenerateVideo(samples)
 ```
 
-<img src="img/interpolate.gif" alt="StyleGAN 256" width="250"/>
+<img src="img/interpolate.gif" alt="StyleGAN 256" width="350"/>
 
 ## Detailed information on the implementation
 

diff --git a/img/64x64 ex1.png b/img/64x64 ex1.png
diff --git a/img/64x64/1.png b/img/64x64/1.png
diff --git a/img/64x64/10.png b/img/64x64/10.png
diff --git a/img/64x64/100.png b/img/64x64/100.png
diff --git a/img/64x64/104.png b/img/64x64/104.png
diff --git a/img/64x64/106.png b/img/64x64/106.png
diff --git a/img/64x64/11.png b/img/64x64/11.png
diff --git a/img/64x64/1148.png b/img/64x64/1148.png
diff --git a/img/64x64/1179.png b/img/64x64/1179.png
diff --git a/img/64x64/118.png b/img/64x64/118.png
diff --git a/img/64x64/119.png b/img/64x64/119.png
diff --git a/img/64x64/12.png b/img/64x64/12.png
diff --git a/img/64x64/124.png b/img/64x64/124.png
diff --git a/img/64x64/13.png b/img/64x64/13.png
diff --git a/img/64x64/14.png b/img/64x64/14.png
diff --git a/img/64x64/1434.png b/img/64x64/1434.png
diff --git a/img/64x64/1437.png b/img/64x64/1437.png
diff --git a/img/64x64/146.png b/img/64x64/146.png
diff --git a/img/64x64/15.png b/img/64x64/15.png
diff --git a/img/64x64/1518.png b/img/64x64/1518.png
diff --git a/img/64x64/1581.png b/img/64x64/1581.png
diff --git a/img/64x64/1582.png b/img/64x64/1582.png
diff --git a/img/64x64/16.png b/img/64x64/16.png
diff --git a/img/64x64/1635.png b/img/64x64/1635.png
diff --git a/img/64x64/1686.png b/img/64x64/1686.png
diff --git a/img/64x64/17.png b/img/64x64/17.png
diff --git a/img/64x64/175.png b/img/64x64/175.png
diff --git a/img/64x64/18.png b/img/64x64/18.png
diff --git a/img/64x64/188.png b/img/64x64/188.png
diff --git a/img/64x64/19.png b/img/64x64/19.png
diff --git a/img/64x64/1924.png b/img/64x64/1924.png
diff --git a/img/64x64/194.png b/img/64x64/194.png
diff --git a/img/64x64/1945.png b/img/64x64/1945.png
diff --git a/img/64x64/1952.png b/img/64x64/1952.png
diff --git a/img/64x64/197.png b/img/64x64/197.png
diff --git a/img/64x64/2.png b/img/64x64/2.png
diff --git a/img/64x64/20.png b/img/64x64/20.png
diff --git a/img/64x64/202.png b/img/64x64/202.png
diff --git a/img/64x64/2028.png b/img/64x64/2028.png
diff --git a/img/64x64/2031.png b/img/64x64/2031.png
diff --git a/img/64x64/2032.png b/img/64x64/2032.png
diff --git a/img/64x64/2037.png b/img/64x64/2037.png
diff --git a/img/64x64/2041.png b/img/64x64/2041.png
diff --git a/img/64x64/2042.png b/img/64x64/2042.png
diff --git a/img/64x64/2048.png b/img/64x64/2048.png
diff --git a/img/64x64/205.png b/img/64x64/205.png
diff --git a/img/64x64/2099.png b/img/64x64/2099.png
diff --git a/img/64x64/210.png b/img/64x64/210.png
diff --git a/img/64x64/213.png b/img/64x64/213.png
diff --git a/img/64x64/2139.png b/img/64x64/2139.png
diff --git a/img/64x64/2166.png b/img/64x64/2166.png
diff --git a/img/64x64/2169.png b/img/64x64/2169.png
diff --git a/img/64x64/2187.png b/img/64x64/2187.png
diff --git a/img/64x64/219.png b/img/64x64/219.png
diff --git a/img/64x64/2200.png b/img/64x64/2200.png
diff --git a/img/64x64/2229.png b/img/64x64/2229.png
diff --git a/img/64x64/223.png b/img/64x64/223.png
diff --git a/img/64x64/2230.png b/img/64x64/2230.png
diff --git a/img/64x64/2232.png b/img/64x64/2232.png
diff --git a/img/64x64/2270.png b/img/64x64/2270.png
diff --git a/img/64x64/2275.png b/img/64x64/2275.png
diff --git a/img/64x64/23.png b/img/64x64/23.png
diff --git a/img/64x64/232.png b/img/64x64/232.png
diff --git a/img/64x64/237.png b/img/64x64/237.png
diff --git a/img/64x64/238.png b/img/64x64/238.png
diff --git a/img/64x64/245.png b/img/64x64/245.png
diff --git a/img/64x64/2455.png b/img/64x64/2455.png
diff --git a/img/64x64/246.png b/img/64x64/246.png
diff --git a/img/64x64/2489.png b/img/64x64/2489.png
diff --git a/img/64x64/2490.png b/img/64x64/2490.png
diff --git a/img/64x64/2506.png b/img/64x64/2506.png
diff --git a/img/64x64/2634.png b/img/64x64/2634.png
diff --git a/img/64x64/2649.png b/img/64x64/2649.png
diff --git a/img/64x64/2765.png b/img/64x64/2765.png
diff --git a/img/64x64/2999.png b/img/64x64/2999.png
diff --git a/img/64x64/3.png b/img/64x64/3.png
diff --git a/img/64x64/301.png b/img/64x64/301.png
diff --git a/img/64x64/3028.png b/img/64x64/3028.png
diff --git a/img/64x64/3034.png b/img/64x64/3034.png
diff --git a/img/64x64/3086.png b/img/64x64/3086.png
diff --git a/img/64x64/3091.png b/img/64x64/3091.png
diff --git a/img/64x64/3094.png b/img/64x64/3094.png
diff --git a/img/64x64/3104.png b/img/64x64/3104.png
diff --git a/img/64x64/311.png b/img/64x64/311.png
diff --git a/img/64x64/320.png b/img/64x64/320.png
diff --git a/img/64x64/321.png b/img/64x64/321.png
diff --git a/img/64x64/325.png b/img/64x64/325.png
diff --git a/img/64x64/3279.png b/img/64x64/3279.png
diff --git a/img/64x64/3293.png b/img/64x64/3293.png
diff --git a/img/64x64/333.png b/img/64x64/333.png
diff --git a/img/64x64/3343.png b/img/64x64/3343.png
diff --git a/img/64x64/3371.png b/img/64x64/3371.png
diff --git a/img/64x64/4.png b/img/64x64/4.png
diff --git a/img/64x64/414.png b/img/64x64/414.png
diff --git a/img/64x64/4188.png b/img/64x64/4188.png
diff --git a/img/64x64/4189.png b/img/64x64/4189.png
diff --git a/img/64x64/42.png b/img/64x64/42.png
diff --git a/img/64x64/44.png b/img/64x64/44.png
diff --git a/img/64x64/4409.png b/img/64x64/4409.png
diff --git a/img/64x64/4553.png b/img/64x64/4553.png
diff --git a/img/64x64/497.png b/img/64x64/497.png
diff --git a/img/64x64/5.png b/img/64x64/5.png
diff --git a/img/64x64/5233.png b/img/64x64/5233.png
diff --git a/img/64x64/5414.png b/img/64x64/5414.png
diff --git a/img/64x64/5459.png b/img/64x64/5459.png
diff --git a/img/64x64/5928.png b/img/64x64/5928.png
diff --git a/img/64x64/6.png b/img/64x64/6.png
diff --git a/img/64x64/6022.png b/img/64x64/6022.png
diff --git a/img/64x64/6547.png b/img/64x64/6547.png
diff --git a/img/64x64/6816.png b/img/64x64/6816.png
diff --git a/img/64x64/6964.png b/img/64x64/6964.png
diff --git a/img/64x64/6986.png b/img/64x64/6986.png
diff --git a/img/64x64/7.png b/img/64x64/7.png
diff --git a/img/64x64/7077.png b/img/64x64/7077.png
diff --git a/img/64x64/7138.png b/img/64x64/7138.png
diff --git a/img/64x64/7185.png b/img/64x64/7185.png
diff --git a/img/64x64/7230.png b/img/64x64/7230.png
diff --git a/img/64x64/7537.png b/img/64x64/7537.png
diff --git a/img/64x64/7584.png b/img/64x64/7584.png
diff --git a/img/64x64/8.png b/img/64x64/8.png
diff --git a/img/64x64/8105.png b/img/64x64/8105.png
diff --git a/img/64x64/8116.png b/img/64x64/8116.png
diff --git a/img/64x64/8199.png b/img/64x64/8199.png
diff --git a/img/64x64/8671.png b/img/64x64/8671.png
diff --git a/img/64x64/8672.png b/img/64x64/8672.png
diff --git a/img/64x64/8702.png b/img/64x64/8702.png
diff --git a/img/64x64/8775.png b/img/64x64/8775.png
diff --git a/img/64x64/8786.png b/img/64x64/8786.png
diff --git a/img/64x64/8838.png b/img/64x64/8838.png
diff --git a/img/64x64/8842.png b/img/64x64/8842.png
diff --git a/img/64x64/8924.png b/img/64x64/8924.png
diff --git a/img/64x64/8925.png b/img/64x64/8925.png
diff --git a/img/64x64/8948.png b/img/64x64/8948.png
diff --git a/img/64x64/8953.png b/img/64x64/8953.png
diff --git a/img/64x64/9.png b/img/64x64/9.png
diff --git a/img/64x64/9012.png b/img/64x64/9012.png
diff --git a/img/64x64/9015.png b/img/64x64/9015.png
diff --git a/img/64x64/9020.png b/img/64x64/9020.png
diff --git a/img/64x64/9050.png b/img/64x64/9050.png
diff --git a/img/64x64/9165.png b/img/64x64/9165.png
diff --git a/img/64x64/9262.png b/img/64x64/9262.png
diff --git a/img/64x64/9365.png b/img/64x64/9365.png
diff --git a/img/64x64/9396.png b/img/64x64/9396.png
diff --git a/img/64x64/9415.png b/img/64x64/9415.png
diff --git a/img/64x64/9437.png b/img/64x64/9437.png
diff --git a/img/64x64/9557.png b/img/64x64/9557.png
diff --git a/img/64x64/96.png b/img/64x64/96.png
diff --git a/img/64x64/9699.png b/img/64x64/9699.png
diff --git a/img/64x64/97.png b/img/64x64/97.png
diff --git a/img/64x64/99.png b/img/64x64/99.png
diff --git a/img/64x64/9900.png b/img/64x64/9900.png
diff --git a/img/64x64/9919.png b/img/64x64/9919.png
diff --git a/img/64x64/9924.png b/img/64x64/9924.png
diff --git a/img/64x64/9939.png b/img/64x64/9939.png
diff --git a/img/64x64/9975.png b/img/64x64/9975.png
diff --git a/img/64x64/9976.png b/img/64x64/9976.png
diff --git a/img/interpolate.gif b/img/interpolate.gif
diff --git a/img/interpolate.mp4 b/img/interpolate.mp4
diff --git a/start.py b/start.py
@@ -11,8 +11,10 @@
 import os
 
 
-def dynamic_import(module):
-    return importlib.import_module(module)
+def dynamic_import(name):
+    module = importlib.import_module(name)
+    importlib.reload(module)
+    return module
 
 
 def get_py_modules(files_dir):
@@ -91,6 +93,9 @@ def init_train(path_to_config, wandb_set=False, load_dataset=True):
             last_epoch = epochs[-1]
             print(f'{conf["Weight_dir"]}/weight {last_epoch}.pth')
             state = torch.load(f'{conf["Weight_dir"]}/weight {last_epoch}.pth')
+            del_module = lambda key: key if 'module.' != key[:7] else key[7:]
+            state['G'] = {del_module(key): value for key, value in state['G'].items()}
+            state['D'] = {del_module(key): value for key, value in state['D'].items()}
             print(f'Load the pre-trained weight {last_epoch}')
             G.load_state_dict(state['G'])
             D.load_state_dict(state['D'])

diff --git a/utils/images.py b/utils/images.py
@@ -12,9 +12,9 @@ def TensorToImage(img, mean=0.5, std=0.375):
 
 
 def SaveImages(Trainer, dir='img', cnt=1, mean=0.5, std=0.375):
-    TensorImages = Trainer.generate_images(cnt)
     if not os.path.exists(dir):
         os.makedirs(dir)
-    for n, img in enumerate(TensorImages, 1):
+    for n in range(cnt):
+        img = Trainer.generate_images()[0]
         image = Image.fromarray(TensorToImage(img.detach().cpu(), mean, std))
         image.save(f'{dir}/{n}.png')
diff --git a/utils/video.py b/utils/video.py
@@ -2,7 +2,7 @@
 from matplotlib import animation, pyplot as plt
 
 
-def generate_video(samples_list, delay=1000):
+def GenerateVideo(samples_list, delay=1000):
     def process_image(img):
         if len(img.shape) == 4:
             img = img[0]