diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..de657e38 --- /dev/null +++ b/.gitignore @@ -0,0 +1,95 @@ +#### joe made this: http://goel.io/joe + +.env/ + +#####=== OSX ===##### + + +#####=== Python ===##### + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +#### joe made this: http://goel.io/joe + +#####=== OSX ===##### +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/__init__.py b/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/data/__init__.pyc b/data/__init__.pyc deleted file mode 100644 index ecd249bd..00000000 Binary files a/data/__init__.pyc and /dev/null differ diff --git a/data/base_data_loader.pyc b/data/base_data_loader.pyc deleted file mode 100644 index 8696e1c8..00000000 Binary files a/data/base_data_loader.pyc and /dev/null differ diff --git a/data/custom_dataset_data_loader.pyc b/data/custom_dataset_data_loader.pyc deleted file mode 100644 index e9569980..00000000 Binary files a/data/custom_dataset_data_loader.pyc and /dev/null differ diff --git a/data/data_loader.pyc b/data/data_loader.pyc deleted file mode 100644 index c19b6773..00000000 Binary files a/data/data_loader.pyc and /dev/null differ diff --git a/data/dataset/__init__.pyc b/data/dataset/__init__.pyc deleted file mode 100644 index 070dfb8b..00000000 Binary files a/data/dataset/__init__.pyc and /dev/null differ diff --git a/data/dataset/base_dataset.pyc b/data/dataset/base_dataset.pyc deleted file mode 100644 index a180f2c4..00000000 Binary files a/data/dataset/base_dataset.pyc and /dev/null differ diff --git a/data/dataset/jnd_dataset.pyc b/data/dataset/jnd_dataset.pyc deleted file mode 100644 index ccea8e09..00000000 Binary files a/data/dataset/jnd_dataset.pyc and /dev/null differ diff --git a/data/dataset/judgement_dataset.pyc b/data/dataset/judgement_dataset.pyc deleted file mode 100644 index 4d091c85..00000000 Binary files a/data/dataset/judgement_dataset.pyc and /dev/null differ diff --git a/data/dataset/twoafc_dataset.pyc b/data/dataset/twoafc_dataset.pyc deleted file mode 100644 index ddcdcde7..00000000 Binary files a/data/dataset/twoafc_dataset.pyc and /dev/null differ diff --git a/data/image_folder.pyc b/data/image_folder.pyc deleted file mode 100644 index 4e09783c..00000000 Binary files a/data/image_folder.pyc and /dev/null differ diff --git a/models/__init__.pyc b/models/__init__.pyc deleted file mode 100644 index 89431502..00000000 Binary files a/models/__init__.pyc and /dev/null differ diff --git a/models/base_model.pyc b/models/base_model.pyc deleted file mode 100644 index 26c82158..00000000 Binary files a/models/base_model.pyc and /dev/null differ diff --git a/models/dist_model.py b/models/dist_model.py index fc4afeef..d4beefe0 100755 --- a/models/dist_model.py +++ b/models/dist_model.py @@ -31,11 +31,11 @@ def initialize(self, model='net-lin', net='squeeze', colorspace='Lab', use_gpu=T self.model = model self.net = net self.use_gpu = use_gpu - + print(use_gpu) self.model_name = '%s [%s]'%(model,net) if(self.model == 'net-lin'): # pretrained net + linear layer self.net = networks.PNetLin(use_gpu=use_gpu,pnet_type=net,use_dropout=True) - self.net.load_state_dict(torch.load('./weights/%s.pth'%net)) + self.net.load_state_dict(torch.load('./weights/%s.pth'%net, map_location=lambda storage, loc: 'cpu')) elif(self.model=='net'): # pretrained network self.net = networks.PNet(use_gpu=use_gpu,pnet_type=net) self.is_fake_net = True @@ -100,7 +100,7 @@ def score_2afc_dataset(data_loader,func): OUTPUTS [0] - 2AFC score in [0,1], fraction of time func agrees with human evaluators [1] - dictionary with following elements - d0s,d1s - N arrays containing distances between reference patch to perturbed patches + d0s,d1s - N arrays containing distances between reference patch to perturbed patches gts - N array in [0,1], preferred patch selected by human evaluators (closer to "0" for left patch p0, "1" for right patch p1, "0.6" means 60pct people preferred right patch, 40pct preferred left) diff --git a/models/dist_model.pyc b/models/dist_model.pyc deleted file mode 100644 index eb4356a4..00000000 Binary files a/models/dist_model.pyc and /dev/null differ diff --git a/models/models.pyc b/models/models.pyc deleted file mode 100644 index 4ad3e8c2..00000000 Binary files a/models/models.pyc and /dev/null differ diff --git a/models/networks_basic.py b/models/networks_basic.py index 64f3e399..dc89e093 100755 --- a/models/networks_basic.py +++ b/models/networks_basic.py @@ -7,7 +7,7 @@ from util import util from skimage import color from IPython import embed -import pretrained_networks as pn +from . import pretrained_networks as pn # Off-the-shelf deep network class PNet(nn.Module): @@ -194,7 +194,7 @@ def forward(self, in0, in1): value = torch.mean(torch.mean(torch.mean((in0-in1)**2,dim=1).view(N,1,X,Y),dim=2).view(N,1,1,Y),dim=3).view(N) return value elif(self.colorspace=='Lab'): - value = util.l2(util.tensor2np(util.tensor2tensorlab(in0.data,to_norm=False)), + value = util.l2(util.tensor2np(util.tensor2tensorlab(in0.data,to_norm=False)), util.tensor2np(util.tensor2tensorlab(in1.data,to_norm=False)), range=100.).astype('float') ret_var = Variable( torch.Tensor((value,) ) ) if(self.use_gpu): @@ -209,7 +209,7 @@ def forward(self, in0, in1): if(self.colorspace=='RGB'): value = util.dssim(1.*util.tensor2im(in0.data), 1.*util.tensor2im(in1.data), range=255.).astype('float') elif(self.colorspace=='Lab'): - value = util.dssim(util.tensor2np(util.tensor2tensorlab(in0.data,to_norm=False)), + value = util.dssim(util.tensor2np(util.tensor2tensorlab(in0.data,to_norm=False)), util.tensor2np(util.tensor2tensorlab(in1.data,to_norm=False)), range=100.).astype('float') ret_var = Variable( torch.Tensor((value,) ) ) if(self.use_gpu): diff --git a/models/networks_basic.pyc b/models/networks_basic.pyc deleted file mode 100644 index aa4b8185..00000000 Binary files a/models/networks_basic.pyc and /dev/null differ diff --git a/models/pretrained_networks.pyc b/models/pretrained_networks.pyc deleted file mode 100644 index 00ad24fc..00000000 Binary files a/models/pretrained_networks.pyc and /dev/null differ diff --git a/models/siam_model.pyc b/models/siam_model.pyc deleted file mode 100644 index bcc42518..00000000 Binary files a/models/siam_model.pyc and /dev/null differ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..0939b6cb --- /dev/null +++ b/requirements.txt @@ -0,0 +1,32 @@ +appnope==0.1.0 +cycler==0.10.0 +decorator==4.2.1 +ipython==6.2.1 +ipython-genutils==0.2.0 +jedi==0.11.1 +matplotlib==2.1.1 +networkx==2.0 +numpy==1.14.0 +opencv-python==3.4.0.12 +parso==0.1.1 +pexpect==4.3.1 +pickleshare==0.7.4 +Pillow==5.0.0 +progressbar2==3.34.3 +prompt-toolkit==1.0.15 +ptyprocess==0.5.2 +Pygments==2.2.0 +pyparsing==2.2.0 +python-dateutil==2.6.1 +python-utils==2.2.0 +pytz==2017.3 +PyWavelets==0.5.2 +PyYAML==3.12 +scikit-image==0.13.1 +scipy==1.0.0 +simplegeneric==0.8.1 +six==1.11.0 +torch==0.3.0.post4 +torchvision==0.2.0 +traitlets==4.3.2 +wcwidth==0.1.7 diff --git a/test_network.py b/test_network.py index d3894759..2acbed02 100644 --- a/test_network.py +++ b/test_network.py @@ -8,7 +8,7 @@ # Linearly calibrated models # model.initialize(model='net-lin',net='squeeze',use_gpu=True) -model.initialize(model='net-lin',net='alex',use_gpu=True) +model.initialize(model='net-lin',net='alex',use_gpu=False) # model.initialize(model='net-lin',net='vgg',use_gpu=True) # Off-the-shelf uncalibrated networks diff --git a/util/__init__.pyc b/util/__init__.pyc deleted file mode 100644 index baccd7f4..00000000 Binary files a/util/__init__.pyc and /dev/null differ diff --git a/util/__pycache__/__init__.cpython-34.pyc b/util/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index e583c115..00000000 Binary files a/util/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/util/__pycache__/util.cpython-34.pyc b/util/__pycache__/util.cpython-34.pyc deleted file mode 100644 index cc3ca527..00000000 Binary files a/util/__pycache__/util.cpython-34.pyc and /dev/null differ diff --git a/util/html.pyc b/util/html.pyc deleted file mode 100644 index 3c8dc102..00000000 Binary files a/util/html.pyc and /dev/null differ diff --git a/util/util.pyc b/util/util.pyc deleted file mode 100644 index 0054c757..00000000 Binary files a/util/util.pyc and /dev/null differ diff --git a/util/visualizer.pyc b/util/visualizer.pyc deleted file mode 100644 index 77bac8a6..00000000 Binary files a/util/visualizer.pyc and /dev/null differ