update

cl0ver012 · Jan 6, 2019 · f6115b9 · f6115b9
1 parent e0b18c9
commit f6115b9
Show file tree

Hide file tree

Showing 70 changed files with 54 additions and 60 deletions.
diff --git a/Combined_Dataset/Test_set/Composition_code_revised.py b/Combined_Dataset/Test_set/Composition_code_revised.py
@@ -2,22 +2,22 @@
 import time
 import cv2 as cv
 import numpy as np
-from console_progressbar import ProgressBar
+from tqdm import tqdm
 
 ##############################################################
 # Set your paths here
 
 # path to provided foreground images
-fg_path = 'fg_test/'
+fg_path = 'data/fg_test/'
 
 # path to provided alpha mattes
-a_path = 'mask_test/'
+a_path = 'data/mask_test/'
 
 # Path to background images (MSCOCO)
-bg_path = 'bg_test/'
+bg_path = 'data/bg_test/'
 
 # Path to folder where you want the composited images to go
-out_path = 'merged_test/'
+out_path = 'data/merged_test/'
 
 
 ##############################################################
@@ -60,18 +60,18 @@ def do_composite_test():
     # a_files = os.listdir(a_path)
     num_samples = len(fg_files) * num_bgs
 
-    pb = ProgressBar(total=100, prefix='Compose test images', suffix='', decimals=3, length=50, fill='=')
+    # pb = ProgressBar(total=100, prefix='Compose test images', suffix='', decimals=3, length=50, fill='=')
     start = time.time()
     bcount = 0
-    for fcount in range(len(fg_files)):
+    for fcount in tqdm(range(len(fg_files))):
         im_name = fg_files[fcount]
 
         for i in range(num_bgs):
             bg_name = bg_files[bcount]
             process(im_name, bg_name, fcount, bcount)
             bcount += 1
 
-            pb.print_progress_bar(bcount * 100.0 / num_samples)
+            # pb.print_progress_bar(bcount * 100.0 / num_samples)
 
     end = time.time()
     elapsed = end - start

diff --git a/Combined_Dataset/Training_set/Composition_code_revised.py b/Combined_Dataset/Training_set/Composition_code_revised.py
@@ -2,22 +2,22 @@
 import time
 import cv2 as cv
 import numpy as np
-from console_progressbar import ProgressBar
+from tqdm import tqdm
 
 ##############################################################
 # Set your paths here
 
 # path to provided foreground images
-fg_path = 'fg/'
+fg_path = 'data/fg/'
 
 # path to provided alpha mattes
-a_path = 'mask/'
+a_path = 'data/mask/'
 
 # Path to background images (MSCOCO)
-bg_path = 'bg/'
+bg_path = 'data/bg/'
 
 # Path to folder where you want the composited images to go
-out_path = 'merged/'
+out_path = 'data/merged/'
 
 
 ##############################################################
@@ -60,18 +60,18 @@ def do_composite():
     # a_files = os.listdir(a_path)
     num_samples = len(fg_files) * num_bgs
 
-    pb = ProgressBar(total=100, prefix='Compose train images', suffix='', decimals=3, length=50, fill='=')
+    # pb = ProgressBar(total=100, prefix='Compose train images', suffix='', decimals=3, length=50, fill='=')
     start = time.time()
     bcount = 0
-    for fcount in range(len(fg_files)):
+    for fcount in tqdm(range(len(fg_files))):
         im_name = fg_files[fcount]
 
         for i in range(num_bgs):
             bg_name = bg_files[bcount]
             process(im_name, bg_name, fcount, bcount)
             bcount += 1
 
-            pb.print_progress_bar(bcount * 100.0 / num_samples)
+            # pb.print_progress_bar(bcount * 100.0 / num_samples)
 
     end = time.time()
     elapsed = end - start

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Go to [MSCOCO](http://cocodataset.org/#download) to download:
 
 ### PASCAL VOC
 Go to [PASCAL VOC](http://host.robots.ox.ac.uk/pascal/VOC/) to download:
-* VOC challenge 2007 [training/validation data](http://host.robots.ox.ac.uk/pascal/VOC/voc2007/VOCtrainval_06-Nov-2007.tar)
+* VOC challenge 2008 [training/validation data](http://host.robots.ox.ac.uk/pascal/VOC/voc2008/VOCtrainval_14-Jul-2008.tar)
 
 ## ImageNet Pretrained Models
 Download [VGG16](https://github.com/fchollet/deep-learning-models/releases/download/v0.1/vgg16_weights_tf_dim_ordering_tf_kernels.h5) into models folder.

diff --git a/config.py b/config.py
@@ -16,16 +16,15 @@
 # Set your paths here
 
 # path to provided foreground images
-fg_path = 'fg/'
+fg_path = 'data/fg/'
 
 # path to provided alpha mattes
-a_path = 'mask/'
+a_path = 'data/mask/'
 
 # Path to background images (MSCOCO)
-bg_path = 'bg/'
+bg_path = 'data/bg/'
 
 # Path to folder where you want the composited images to go
-out_path = 'merged/'
+out_path = 'data/merged/'
 
-
-##############################################################
+##############################################################
diff --git a/custom_layers/unpooling_layer.py b/custom_layers/unpooling_layer.py
@@ -1,6 +1,6 @@
 from keras import backend as K
 from keras.engine.topology import Layer
-from keras.layers import Reshape, Concatenate, Lambda, Multiply
+from keras.layers import Lambda, Multiply
 
 
 class Unpooling(Layer):

diff --git a/data_generator.py b/data_generator.py
@@ -27,15 +27,15 @@
 def get_alpha(name):
     fg_i = int(name.split("_")[0])
     name = fg_files[fg_i]
-    filename = os.path.join('mask', name)
+    filename = os.path.join('data/mask', name)
     alpha = cv.imread(filename, 0)
     return alpha
 
 
 def get_alpha_test(name):
     fg_i = int(name.split("_")[0])
     name = fg_test_files[fg_i]
-    filename = os.path.join('mask_test', name)
+    filename = os.path.join('data/mask_test', name)
     alpha = cv.imread(filename, 0)
     return alpha
 

diff --git a/demo.py b/demo.py
@@ -39,12 +39,12 @@ def composite4(fg, bg, a, w, h):
     final.load_weights(pretrained_path)
     print(final.summary())
 
-    out_test_path = 'merged_test/'
+    out_test_path = 'data/merged_test/'
     test_images = [f for f in os.listdir(out_test_path) if
                    os.path.isfile(os.path.join(out_test_path, f)) and f.endswith('.png')]
     samples = random.sample(test_images, 10)
 
-    bg_test = 'bg_test/'
+    bg_test = 'data/bg_test/'
     test_bgs = [f for f in os.listdir(bg_test) if
                 os.path.isfile(os.path.join(bg_test, f)) and f.endswith('.jpg')]
     sample_bgs = random.sample(test_bgs, 10)

diff --git a/images/0_alpha.png b/images/0_alpha.png
diff --git a/images/0_compose.png b/images/0_compose.png
diff --git a/images/0_image.png b/images/0_image.png
diff --git a/images/0_new_bg.png b/images/0_new_bg.png
diff --git a/images/0_out.png b/images/0_out.png
diff --git a/images/0_trimap.png b/images/0_trimap.png
diff --git a/images/1_alpha.png b/images/1_alpha.png
diff --git a/images/1_compose.png b/images/1_compose.png
diff --git a/images/1_image.png b/images/1_image.png
diff --git a/images/1_new_bg.png b/images/1_new_bg.png
diff --git a/images/1_out.png b/images/1_out.png
diff --git a/images/1_trimap.png b/images/1_trimap.png
diff --git a/images/2_alpha.png b/images/2_alpha.png
diff --git a/images/2_compose.png b/images/2_compose.png
diff --git a/images/2_image.png b/images/2_image.png
diff --git a/images/2_new_bg.png b/images/2_new_bg.png
diff --git a/images/2_out.png b/images/2_out.png
diff --git a/images/2_trimap.png b/images/2_trimap.png
diff --git a/images/3_alpha.png b/images/3_alpha.png
diff --git a/images/3_compose.png b/images/3_compose.png
diff --git a/images/3_image.png b/images/3_image.png
diff --git a/images/3_new_bg.png b/images/3_new_bg.png
diff --git a/images/3_out.png b/images/3_out.png
diff --git a/images/3_trimap.png b/images/3_trimap.png
diff --git a/images/4_alpha.png b/images/4_alpha.png
diff --git a/images/4_compose.png b/images/4_compose.png
diff --git a/images/4_image.png b/images/4_image.png
diff --git a/images/4_new_bg.png b/images/4_new_bg.png
diff --git a/images/4_out.png b/images/4_out.png
diff --git a/images/4_trimap.png b/images/4_trimap.png
diff --git a/images/5_alpha.png b/images/5_alpha.png
diff --git a/images/5_compose.png b/images/5_compose.png
diff --git a/images/5_image.png b/images/5_image.png
diff --git a/images/5_new_bg.png b/images/5_new_bg.png
diff --git a/images/5_out.png b/images/5_out.png
diff --git a/images/5_trimap.png b/images/5_trimap.png
diff --git a/images/6_alpha.png b/images/6_alpha.png
diff --git a/images/6_compose.png b/images/6_compose.png
diff --git a/images/6_image.png b/images/6_image.png
diff --git a/images/6_new_bg.png b/images/6_new_bg.png
diff --git a/images/6_out.png b/images/6_out.png
diff --git a/images/6_trimap.png b/images/6_trimap.png
diff --git a/images/7_alpha.png b/images/7_alpha.png
diff --git a/images/7_compose.png b/images/7_compose.png
diff --git a/images/7_image.png b/images/7_image.png
diff --git a/images/7_new_bg.png b/images/7_new_bg.png
diff --git a/images/7_out.png b/images/7_out.png
diff --git a/images/7_trimap.png b/images/7_trimap.png
diff --git a/images/8_alpha.png b/images/8_alpha.png
diff --git a/images/8_compose.png b/images/8_compose.png
diff --git a/images/8_image.png b/images/8_image.png
diff --git a/images/8_new_bg.png b/images/8_new_bg.png
diff --git a/images/8_out.png b/images/8_out.png
diff --git a/images/8_trimap.png b/images/8_trimap.png
diff --git a/images/9_alpha.png b/images/9_alpha.png
diff --git a/images/9_compose.png b/images/9_compose.png
diff --git a/images/9_image.png b/images/9_image.png
diff --git a/images/9_new_bg.png b/images/9_new_bg.png
diff --git a/images/9_out.png b/images/9_out.png
diff --git a/images/9_trimap.png b/images/9_trimap.png
diff --git a/pre-process.py → pre_process.py b/pre-process.py → pre_process.py
@@ -10,38 +10,38 @@
 
 if __name__ == '__main__':
     # path to provided foreground images
-    fg_path = 'fg/'
+    fg_path = 'data/fg/'
     # path to provided alpha mattes
-    a_path = 'mask/'
+    a_path = 'data/mask/'
     # Path to background images (MSCOCO)
-    bg_path = 'bg/'
+    bg_path = 'data/bg/'
     # Path to folder where you want the composited images to go
-    out_path = 'merged/'
+    out_path = 'data/merged/'
 
     train_folder = 'Combined_Dataset/Training_set/'
 
     # if not os.path.exists('Combined_Dataset'):
-    zip_file = 'Adobe_Deep_Matting_Dataset.zip'
+    zip_file = 'data/Adobe_Deep_Matting_Dataset.zip'
     print('Extracting {}...'.format(zip_file))
 
     zip_ref = zipfile.ZipFile(zip_file, 'r')
-    zip_ref.extractall('.')
+    zip_ref.extractall('data')
     zip_ref.close()
 
     if not os.path.exists(bg_path):
-        zip_file = 'train2014.zip'
+        zip_file = 'data/train2014.zip'
         print('Extracting {}...'.format(zip_file))
 
         zip_ref = zipfile.ZipFile(zip_file, 'r')
-        zip_ref.extractall('.')
+        zip_ref.extractall('data')
         zip_ref.close()
 
         with open(os.path.join(train_folder, 'training_bg_names.txt')) as f:
             training_bg_names = f.read().splitlines()
 
         os.makedirs(bg_path)
         for bg_name in training_bg_names:
-            src_path = os.path.join('train2014', bg_name)
+            src_path = os.path.join('data/train2014', bg_name)
             dest_path = os.path.join(bg_path, bg_name)
             shutil.move(src_path, dest_path)
 
@@ -70,40 +70,40 @@
     # do_composite()
 
     # path to provided foreground images
-    fg_test_path = 'fg_test/'
+    fg_test_path = 'data/fg_test/'
     # path to provided alpha mattes
-    a_test_path = 'mask_test/'
+    a_test_path = 'data/mask_test/'
     # Path to background images (PASCAL VOC)
-    bg_test_path = 'bg_test/'
+    bg_test_path = 'data/bg_test/'
     # Path to folder where you want the composited images to go
-    out_test_path = 'merged_test/'
+    out_test_path = 'data/merged_test/'
 
     # test data gen
     test_folder = 'Combined_Dataset/Test_set/'
 
     if not os.path.exists(bg_test_path):
         os.makedirs(bg_test_path)
 
-    tar_file = 'VOCtrainval_14-Jul-2008.tar'
+    tar_file = 'data/VOCtrainval_14-Jul-2008.tar'
     print('Extracting {}...'.format(tar_file))
 
     tar = tarfile.open(tar_file)
-    tar.extractall()
+    tar.extractall('data')
     tar.close()
 
-    tar_file = 'VOC2008test.tar'
+    tar_file = 'data/VOC2008test.tar'
     print('Extracting {}...'.format(tar_file))
 
     tar = tarfile.open(tar_file)
-    tar.extractall()
+    tar.extractall('data')
     tar.close()
 
     with open(os.path.join(test_folder, 'test_bg_names.txt')) as f:
         test_bg_names = f.read().splitlines()
 
     for bg_name in test_bg_names:
         tokens = bg_name.split('_')
-        src_path = os.path.join('VOCdevkit/VOC2008/JPEGImages', bg_name)
+        src_path = os.path.join('data/VOCdevkit/VOC2008/JPEGImages', bg_name)
         dest_path = os.path.join(bg_test_path, bg_name)
         shutil.move(src_path, dest_path)
 

diff --git a/test_alphamatting.py b/test_alphamatting.py
@@ -18,20 +18,16 @@
         filename = os.path.join('alphamatting/input_lowres', image_name)
         im = cv.imread(filename)
         im_h, im_w = im.shape[:2]
-        
+
         for id in [1, 2, 3]:
             trimap_name = os.path.join('alphamatting/trimap_lowres/Trimap{}'.format(id), image_name)
             trimap = cv.imread(trimap_name, 0)
-
-			for i in range(0, np.ceil(im_h/320)):
-				for j in range(0, np.ceil(im_w/320)):
-					x = j * 320
-					y = i * 320
-					w = min(320, im_w - x)
-					h = min(320, im_h - y)
-					im_crop = im[y:y+h,x:x+w]
-					tri_crop = trimap[y:y+h,x:x+w]
-
-
-
 
+            for i in range(0, np.ceil(im_h / 320)):
+                for j in range(0, np.ceil(im_w / 320)):
+                    x = j * 320
+                    y = i * 320
+                    w = min(320, im_w - x)
+                    h = min(320, im_h - y)
+                    im_crop = im[y:y + h, x:x + w]
+                    tri_crop = trimap[y:y + h, x:x + w]
diff --git a/utils.py b/utils.py
@@ -107,4 +107,3 @@ def draw_str(dst, target, s):
     x, y = target
     cv.putText(dst, s, (x + 1, y + 1), cv.FONT_HERSHEY_PLAIN, 1.0, (0, 0, 0), thickness=2, lineType=cv.LINE_AA)
     cv.putText(dst, s, (x, y), cv.FONT_HERSHEY_PLAIN, 1.0, (255, 255, 255), lineType=cv.LINE_AA)
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -107,4 +107,3 @@ def draw_str(dst, target, s):
		x, y = target
		cv.putText(dst, s, (x + 1, y + 1), cv.FONT_HERSHEY_PLAIN, 1.0, (0, 0, 0), thickness=2, lineType=cv.LINE_AA)
		cv.putText(dst, s, (x, y), cv.FONT_HERSHEY_PLAIN, 1.0, (255, 255, 255), lineType=cv.LINE_AA)