staged.

Chunk
1 parent 554a7b9a
Showing 4 changed files with 18 additions and 14 deletions Show diff stats
mdata/CV.py
mdata/ILSVRC.py
mdata/MSR.py
test/test_data.py
@@ -99,7 +99,7 @@ class DataCV(DataDumperBase):
         return table
  
  
-    def store_image(self):
+    def store_img(self):
         if self.table == None:
             self.table = self.get_table()
  
@@ -292,7 +292,7 @@ class DataILSVRC(DataDumperBase):
         return table
  
  
-    def store_image(self):
+    def store_img(self):
         if self.table == None:
             self.table = self.get_table()
  
@@ -302,7 +302,7 @@ class DataILSVRC(DataDumperBase):
             tsvfile = csv.reader(tsvfile, delimiter='\t')
             for line in tsvfile:
                 path_img = os.path.join(self.img_dir, line[0][:3], line[0][3:] + '.jpg')
-                if path_img:
+		if path_img:
                     with open(path_img, 'rb') as fpic:
                         dict_databuf[line[0] + '.jpg'] = fpic.read()
  
@@ -101,7 +101,7 @@ class DataMSR(DataDumperBase):
         return table
  
  
-    def store_image(self):
+    def store_img(self):
         if self.table == None:
             self.table = self.get_table()
  
@@ -265,4 +265,4 @@ class DataMSR(DataDumperBase):
                 X.append(data[0])
                 Y.append(data[1])
  
-        return X, Y
 \ No newline at end of file
+        return X, Y
@@ -31,25 +31,29 @@ def test_CV():
 def test_ILSVRC():
     timer = Timer()
     # dil = ILSVRC.DataILSVRC(base_dir='/data/hadoop/ImageNet/ILSVRC/ILSVRC2013_DET_val', category='Train')
-    # dil = ILSVRC.DataILSVRC(base_dir='/data/hadoop/ImageNet/ILSVRC/ILSVRC2013_DET_val', category='Test')
-    dil = ILSVRC.DataILSVRC(base_dir='/media/chunk/Elements/D/data/ImageNet/img/ILSVRC2013_DET_val', category='Train_1')
+    dil = ILSVRC.DataILSVRC(base_dir='/data/hadoop/ImageNet/ILSVRC/ILSVRC2013_DET_val', category='Train_1')
+    # dil = ILSVRC.DataILSVRC(base_dir='/media/chunk/Elements/D/data/ImageNet/img/ILSVRC2013_DET_val', category='Train_1')
  
-    # dil.format()
-    # dil.embed(rate=0.1)
-    # dil.extract_feat(feattype='ibd')
+    dil.format()
+    dil.embed(rate=0.1)
+    dil.extract_feat(feattype='ibd')
     # dil.extract_feat(feattype='hog')
  
     timer.mark()
     dil.store_img()
     timer.report()
-    #
+    
+    timer.mark()
+    dil.store_tag()
+    timer.report()
+
     timer.mark()
     dil.store_info()
     timer.report()
  
-    # timer.mark()
-    # dil.store_info()
-    # timer.report()
+    timer.mark()
+    dil.store_feat()
+    timer.report()
  
  
 if __name__ == '__main__':
...	...	@@ -99,7 +99,7 @@ class DataCV(DataDumperBase):
99	99	return table
100	100
101	101
102		- def store_image(self):
	102	+ def store_img(self):
103	103	if self.table == None:
104	104	self.table = self.get_table()
105	105
...	...
...	...	@@ -292,7 +292,7 @@ class DataILSVRC(DataDumperBase):
292	292	return table
293	293
294	294
295		- def store_image(self):
	295	+ def store_img(self):
296	296	if self.table == None:
297	297	self.table = self.get_table()
298	298
...	...	@@ -302,7 +302,7 @@ class DataILSVRC(DataDumperBase):
302	302	tsvfile = csv.reader(tsvfile, delimiter='\t')
303	303	for line in tsvfile:
304	304	path_img = os.path.join(self.img_dir, line[0][:3], line[0][3:] + '.jpg')
305		- if path_img:
	305	+ if path_img:
306	306	with open(path_img, 'rb') as fpic:
307	307	dict_databuf[line[0] + '.jpg'] = fpic.read()
308	308
...	...
...	...	@@ -101,7 +101,7 @@ class DataMSR(DataDumperBase):
101	101	return table
102	102
103	103
104		- def store_image(self):
	104	+ def store_img(self):
105	105	if self.table == None:
106	106	self.table = self.get_table()
107	107
...	...	@@ -265,4 +265,4 @@ class DataMSR(DataDumperBase):
265	265	X.append(data[0])
266	266	Y.append(data[1])
267	267
268		- return X, Y
269	268	\ No newline at end of file
	269	+ return X, Y
...	...
...	...	@@ -31,25 +31,29 @@ def test_CV():
31	31	def test_ILSVRC():
32	32	timer = Timer()
33	33	# dil = ILSVRC.DataILSVRC(base_dir='/data/hadoop/ImageNet/ILSVRC/ILSVRC2013_DET_val', category='Train')
34		- # dil = ILSVRC.DataILSVRC(base_dir='/data/hadoop/ImageNet/ILSVRC/ILSVRC2013_DET_val', category='Test')
35		- dil = ILSVRC.DataILSVRC(base_dir='/media/chunk/Elements/D/data/ImageNet/img/ILSVRC2013_DET_val', category='Train_1')
	34	+ dil = ILSVRC.DataILSVRC(base_dir='/data/hadoop/ImageNet/ILSVRC/ILSVRC2013_DET_val', category='Train_1')
	35	+ # dil = ILSVRC.DataILSVRC(base_dir='/media/chunk/Elements/D/data/ImageNet/img/ILSVRC2013_DET_val', category='Train_1')
36	36
37		- # dil.format()
38		- # dil.embed(rate=0.1)
39		- # dil.extract_feat(feattype='ibd')
	37	+ dil.format()
	38	+ dil.embed(rate=0.1)
	39	+ dil.extract_feat(feattype='ibd')
40	40	# dil.extract_feat(feattype='hog')
41	41
42	42	timer.mark()
43	43	dil.store_img()
44	44	timer.report()
45		- #
	45	+
	46	+ timer.mark()
	47	+ dil.store_tag()
	48	+ timer.report()
	49	+
46	50	timer.mark()
47	51	dil.store_info()
48	52	timer.report()
49	53
50		- # timer.mark()
51		- # dil.store_info()
52		- # timer.report()
	54	+ timer.mark()
	55	+ dil.store_feat()
	56	+ timer.report()
53	57
54	58
55	59	if __name__ == '__main__':
...	...