Fix dependencies

data/dataset/jnd_dataset.py

@@ -5,7 +5,11 @@
 from PIL import Image
 import numpy as np
 import torch
-from IPython import embed
+
+try:
+ from IPython import embed
+except ModuleNotFoundError:
+ embed = lambda: None
 
 class JNDDataset(BaseDataset):
  def initialize(self, dataroot, load_size=64):

data/dataset/twoafc_dataset.py

@@ -5,7 +5,11 @@
 from PIL import Image
 import numpy as np
 import torch
-# from IPython import embed
+
+try:
+ from IPython import embed
+except ModuleNotFoundError:
+ embed = lambda: None
 
 class TwoAFCDataset(BaseDataset):
  def initialize(self, dataroots, load_size=64):

requirements-dev.txt

@@ -0,0 +1,2 @@
+-r requirements.txt
+jupyter

requirements.txt

@@ -6,4 +6,3 @@ scikit-image>=0.13.0
 opencv-python>=2.4.11
 matplotlib>=1.5.1
 tqdm>=4.28.1
-jupyter

setup.py

@@ -14,7 +14,22 @@
  packages=['lpips'],
  package_data={'lpips': ['weights/v0.0/*.pth','weights/v0.1/*.pth']},
  include_package_data=True,
- install_requires=["torch>=0.4.0", "torchvision>=0.2.1", "numpy>=1.14.3", "scipy>=1.0.1", "tqdm>=4.28.1"],
+ install_requires=[
+ "torch>=0.4.0",
+ "torchvision>=0.2.1",
+ "numpy>=1.14.3",
+ "scipy>=1.0.1",
+ "scikit-image>=0.13.0",
+ "tqdm>=4.28.1",
+ ],
+ extras_require = {
+ "dev": ["jupyter"],
+ "loadimage": [
+ "rawpy>=0.17.2",
+ "opencv-python>=2.4.11",
+ "matplotlib>=1.5.1",
+ ],
+ },
  classifiers=[
  "Programming Language :: Python :: 3",
  "License :: OSI Approved :: BSD License",

test_dataset_model.py

@@ -2,7 +2,11 @@
 import lpips
 from data import data_loader as dl
 import argparse
-from IPython import embed
+
+try:
+ from IPython import embed
+except ModuleNotFoundError:
+ embed = lambda: None
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--dataset_mode', type=str, default='2afc', help='[2afc,jnd]')

test_network.py

@@ -1,6 +1,10 @@
 import torch
 import lpips
-from IPython import embed
+
+try:
+ from IPython import embed
+except ModuleNotFoundError:
+ embed = lambda: None
 
 use_gpu = False # Whether to use GPU
 spatial = True # Return a spatial map of perceptual distance.

util/util.py

@@ -4,7 +4,6 @@
 from PIL import Image
 import numpy as np
 import os
-import matplotlib.pyplot as plt
 import torch
 
 def load_image(path):
@@ -16,6 +15,7 @@ def load_image(path):
  import cv2
  return cv2.imread(path)[:,:,::-1]
  else:
+ import matplotlib.pyplot as plt
  img = (255*plt.imread(path)[:,:,:3]).astype('uint8')
 
  return img

util/visualizer.py

@@ -5,7 +5,11 @@
 from . import html
 import matplotlib.pyplot as plt
 import math
-# from IPython import embed
+
+try:
+ from IPython import embed
+except ModuleNotFoundError:
+ embed = lambda: None
 
 def zoom_to_res(img,res=256,order=0,axis=0):
  # img 3xXxX