utils and dataset implemented

Notebook.py

@@ -0,0 +1,21 @@
+# Funcion para crear directorios, es necesario e abspath?
+##### se agregó a utils
+import os
+
+def create_dir(child_dir_str):
+
+    try:
+        pardir = os.path.abspath('static/')
+        original_umask  = os.umask(0o000)
+        os.makedirs(pardir, exist_ok=True)
+        child_dir = os.path.join(pardir,child_dir_str)
+        child_dir = os.path.abspath('static/')
+        os.makedirs(child_dir, exist_ok=True)
+    finally:
+        os.umask(original_umask)
+        print('static folder created:', os.path.isdir(pardir))
+        print('img folder created: ', os.path.isdir(child_dir))
+
+#create_dir('img')
+
+#######################################################

core/dataset.py

@@ -1,5 +1,6 @@
 import numpy as np
-import scipy.misc
+#import scipy.misc
+import imageio
 import os
 from PIL import Image
 from torchvision import transforms
@@ -25,11 +26,12 @@ def __init__(self, root, is_train=True, data_len=None):
         train_file_list = [x for i, x in zip(train_test_list, img_name_list) if i]
         test_file_list = [x for i, x in zip(train_test_list, img_name_list) if not i]
         if self.is_train:
-            self.train_img = [scipy.misc.imread(os.path.join(self.root, 'images', train_file)) for train_file in
+            #se cambió scipy.misc.imread por imageio.imread
+            self.train_img = [imageio.imread(os.path.join(self.root, 'images', train_file)) for train_file in
                               train_file_list[:data_len]]
             self.train_label = [x for i, x in zip(train_test_list, label_list) if i][:data_len]
         if not self.is_train:
-            self.test_img = [scipy.misc.imread(os.path.join(self.root, 'images', test_file)) for test_file in
+            self.test_img = [imageio.imread(os.path.join(self.root, 'images', test_file)) for test_file in
                              test_file_list[:data_len]]
             self.test_label = [x for i, x in zip(train_test_list, label_list) if not i][:data_len]
 
@@ -53,6 +55,7 @@ def __getitem__(self, index):
             img = transforms.Resize((600, 600), Image.BILINEAR)(img)
             img = transforms.CenterCrop(INPUT_SIZE)(img)
             img = transforms.ToTensor()(img)
+
             img = transforms.Normalize([0.485, 0.456, 0.406], [0.229, 0.224, 0.225])(img)
 
         return img, target

core/utils.py

@@ -4,7 +4,20 @@
 import time
 import logging
 
+import time
+
+def timer(func):
+    def wrapper(*args, **kwargs):
+        start = time.time()
+        rv = func(*args, **kwargs)
+        total = time.time() - start
+        print(f'Total: {total}')
+        return rv
+    return wrapper
+
+
 _, term_width = os.popen('stty size', 'r').read().split()
+#term_width = 80
 term_width = int(term_width)
 
 TOTAL_BAR_LENGTH = 40.
@@ -100,5 +113,19 @@ def init_log(output_dir):
     logging.getLogger('').addHandler(console)
     return logging
 
+#se agrega para crear las carpetas con los permisos correspondientes
+def create_dir(dir_str):
+
+    try:
+        pardir = os.path.abspath(f'{dir_str}')
+        original_umask  = os.umask(0o000)
+        os.makedirs(pardir,exist_ok=True)
+
+    finally:
+        os.umask(original_umask)
+        print(f'{dir_str} folder created:', os.path.isdir(pardir))
+
+    return os.path.abspath('./save_dir')
+
 if __name__ == '__main__':
     pass