Added Caltech101, Caltech256

ragavvenkatesan · Jan 31, 2017 · e874c70 · e874c70
1 parent c411c3a
commit e874c70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 43 deletions.
diff --git a/yann/special/datasets.py b/yann/special/datasets.py
@@ -284,11 +284,11 @@ def cook_caltech256(verbose = 1, **kwargs):
                     "source"             : 'skdata',                                   
                     "name"               : 'caltech256',    
                     "location"			 : '',                                      
-                    "mini_batch_size"    : 127,                                     
+                    "mini_batch_size"    : 72,                                     
                     "mini_batches_per_batch" : (1, 1, 1), 
-                    "batches2train"      : 120,                                      
-                    "batches2test"       : 61,                                      
-                    "batches2validate"   : 60,                                        
+                    "batches2train"      : 212,                                      
+                    "batches2test"       : 113,                                      
+                    "batches2validate"   : 100,                                        
                     "height"             : 224,                                       
                     "width"              : 224,                                       
                     "channels"           : 3  }    

diff --git a/yann/utils/dataset.py b/yann/utils/dataset.py
@@ -45,52 +45,16 @@
 
 from scipy.misc import imresize as imresize
 
-
 thismodule = sys.modules[__name__]
 
-# from sklearn.base import TransformerMixin, BaseEstimator
-def unpickle_cifar100(file):
-    import cPickle
-    fo = open(file, 'rb')
-    dict = cPickle.load(fo)
-    fo.close()
-    return dict
 
 def load_cifar100 ():
 	"""
 	Function that downloads the cifar 100 dataset and returns the dataset in full
+
+	TODO: Need to implement this.
 	"""
-	import os.path 	
-	if not os.path.exists('cifar-100-python.tar.gz'):
-		import urllib2
-		url = "http://www.cs.toronto.edu/~kriz/cifar-100-python.tar.gz"
-
-		file_name = url.split('/')[-1]
-		u = urllib2.urlopen(url)
-		f = open(file_name, 'wb')
-		meta = u.info()
-		file_size = int(meta.getheaders("Content-Length")[0])
-		print "Downloading: %s Bytes: %s" % (file_name, file_size)
-
-		file_size_dl = 0
-		block_sz = 8192
-		while True:
-			buffer = u.read(block_sz)
-			if not buffer:
-				break
-			file_size_dl += len(buffer)
-			f.write(buffer)
-			status = r"%10d  [%3.2f%%]" % (file_size_dl, file_size_dl * 100. / file_size)
-			status = status + chr(8)*(len(status)+1)
-			print status,
-		f.close()
-	import tarfile
-	tar = tarfile.open("cifar-100-python.tar.gz")
-	tar.extractall()
-	tar.close()
-	train = unpickle_cifar100('./cifar-100-python/train')
-	import pdb
-	pdb.set_trace()
+	print "Not implemented yet."
 
 def load_data_mat(classes, 
                   height,