Skip to content

Commit

Permalink
flake8 improvements.
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon Amos committed Dec 24, 2015
1 parent 5177deb commit dceb6a9
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 53 deletions.
8 changes: 1 addition & 7 deletions demos/classifier.py
Expand Up @@ -24,7 +24,6 @@

import argparse
import cv2
import itertools
import os
import pickle

Expand All @@ -34,20 +33,15 @@
np.set_printoptions(precision=2)
import pandas as pd

import sys
fileDir = os.path.dirname(os.path.realpath(__file__))

import openface
import openface.helper
from openface.data import iterImgs
from openface.alignment import NaiveDlib

from sklearn.preprocessing import LabelEncoder
from sklearn.decomposition import PCA
from sklearn.grid_search import GridSearchCV
from sklearn.manifold import TSNE
from sklearn.svm import SVC

fileDir = os.path.dirname(os.path.realpath(__file__))
modelDir = os.path.join(fileDir, '..', 'models')
dlibModelDir = os.path.join(modelDir, 'dlib')
openfaceModelDir = os.path.join(modelDir, 'openface')
Expand Down
5 changes: 1 addition & 4 deletions demos/compare.py
Expand Up @@ -30,14 +30,11 @@
import numpy as np
np.set_printoptions(precision=2)

import sys
fileDir = os.path.dirname(os.path.realpath(__file__))

import openface
import openface.helper
from openface.data import iterImgs
from openface.alignment import NaiveDlib # Depends on dlib.

fileDir = os.path.dirname(os.path.realpath(__file__))
modelDir = os.path.join(fileDir, '..', 'models')
dlibModelDir = os.path.join(modelDir, 'dlib')
openfaceModelDir = os.path.join(modelDir, 'openface')
Expand Down
7 changes: 6 additions & 1 deletion demos/web/create-unknown-vectors.py
Expand Up @@ -28,6 +28,11 @@
from openface.alignment import NaiveDlib
from openface.data import iterImgs

fileDir = os.path.dirname(os.path.realpath(__file__))
modelDir = os.path.join(fileDir, '..', 'models')
dlibModelDir = os.path.join(modelDir, 'dlib')
openfaceModelDir = os.path.join(modelDir, 'openface')

parser = argparse.ArgumentParser()
parser.add_argument('imgDir', type=str, help="Input image directory.")
parser.add_argument('--numImages', type=int, default=1000)
Expand All @@ -43,7 +48,7 @@
args = parser.parse_args()

align = NaiveDlib(args.dlibFacePredictor)
openface = openface.TorchWrap(args.model, imgDim=args.imgDim, cuda=False)
net = openface.TorchWrap(args.model, imgDim=args.imgDim, cuda=False)


def getRep(imgPath):
Expand Down
3 changes: 0 additions & 3 deletions demos/web/websocket-server.py
Expand Up @@ -29,7 +29,6 @@

import argparse
import cv2
import dlib
import imagehash
import json
from PIL import Image
Expand All @@ -52,8 +51,6 @@
import openface
from openface.alignment import NaiveDlib # Depends on dlib.

import tempfile

modelDir = os.path.join(fileDir, '..', '..', 'models')
dlibModelDir = os.path.join(modelDir, 'dlib')
openfaceModelDir = os.path.join(modelDir, 'openface')
Expand Down
4 changes: 0 additions & 4 deletions evaluation/lfw.py
Expand Up @@ -19,19 +19,15 @@
import pandas as pd
from scipy.interpolate import interp1d

from sklearn import cross_validation
from sklearn.cross_validation import KFold
from sklearn.metrics import accuracy_score
from sklearn.metrics.pairwise import chi2_kernel
from sklearn.svm import SVC

import matplotlib as mpl
mpl.use('Agg')
import matplotlib.pyplot as plt
plt.style.use('bmh')

import os
import sys

import argparse

Expand Down
1 change: 0 additions & 1 deletion openface/__init__.py
Expand Up @@ -17,7 +17,6 @@
from subprocess import Popen, PIPE
import os
import os.path
import time
import sys

import numpy as np
Expand Down
2 changes: 2 additions & 0 deletions openface/alignment/__init__.py
@@ -1 +1,3 @@
# flake8: noqa

from .naive_dlib import NaiveDlib
7 changes: 0 additions & 7 deletions openface/alignment/naive_dlib.py
Expand Up @@ -12,16 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import argparse
import cv2
import dlib
import numpy as np
import os
import random
import sys

from .. import helper
from .. import data

TEMPLATE = np.float32([
(0.0792396913815, 0.339223741112), (0.0829219487236, 0.456955367943),
Expand Down
6 changes: 0 additions & 6 deletions test.py
Expand Up @@ -14,7 +14,6 @@


import cv2
import openface
import os

import numpy as np
Expand All @@ -24,18 +23,13 @@
import scipy
import scipy.spatial

import time

import openface
import openface.helper
from openface.data import iterImgs
from openface.alignment import NaiveDlib # Depends on dlib.

from subprocess import Popen, PIPE

import sys
fileDir = os.path.dirname(os.path.realpath(__file__))

modelDir = os.path.join(fileDir, 'models')
dlibModelDir = os.path.join(modelDir, 'dlib')
openfaceModelDir = os.path.join(modelDir, 'openface')
Expand Down
1 change: 0 additions & 1 deletion training/plot-loss.py
Expand Up @@ -20,7 +20,6 @@
mpl.use('Agg')
import matplotlib.pyplot as plt
plt.style.use('bmh')
import numpy as np
import pandas as pd

import os
Expand Down
2 changes: 2 additions & 0 deletions util/align-dlib.py
Expand Up @@ -19,6 +19,8 @@
fileDir = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(fileDir, ".."))

import numpy as np

import argparse
import cv2
import random
Expand Down
26 changes: 11 additions & 15 deletions util/annotate-image.py
Expand Up @@ -14,6 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.


# TODO: This file is incomplete.


import os
import sys
fileDir = os.path.dirname(os.path.realpath(__file__))
Expand All @@ -22,6 +26,9 @@
import argparse
import cv2

# import openface.helper
from openface.alignment import NaiveDlib

modelDir = os.path.join(fileDir, '..', 'models')
dlibModelDir = os.path.join(modelDir, 'dlib')
openfaceModelDir = os.path.join(modelDir, 'openface')
Expand All @@ -32,17 +39,17 @@ def main(args):

bgrImg = cv2.imread(args.img)
if bgrImg is None:
raise Exception("Unable to load image: {}".format(imgPath))
raise Exception("Unable to load image: {}".format(args.img))
rgbImg = cv2.cvtColor(bgrImg, cv2.COLOR_BGR2RGB)

bb = align.getLargestFaceBoundingBox(rgbImg)
if bb is None:
raise Exception("Unable to find a face: {}".format(imgPath))
raise Exception("Unable to find a face: {}".format(args.img))

landmarks = align.align(rgbImg, bb)
if landmarks is None:
raise Exception("Unable to align image: {}".format(imgPath))
alignedFace = align.alignImg("affine", args.size, rgbImg, bb, landmarks)
raise Exception("Unable to align image: {}".format(args.img))
# alignedFace = align.alignImg("affine", args.size, rgbImg, bb, landmarks)

bl = (bb.left(), bb.bottom())
tr = (bb.right(), bb.top())
Expand All @@ -58,22 +65,11 @@ def main(args):
parser.add_argument('img', type=str, help="Input image.")
parser.add_argument('--dlibFacePredictor', type=str, help="Path to dlib's face predictor.",
default=os.path.join(dlibModelDir, "shape_predictor_68_face_landmarks.dat"))
parser.add_argument('--dlibRoot', type=str,
default=os.path.expanduser(
"~/src/dlib-18.16/python_examples"),
help="dlib directory with the dlib.so Python library.")

parser.add_argument('landmarks', type=str,
choices=['outerEyesAndNose', 'innerEyesAndBottomLip'],
help='The landmarks to align to.')
parser.add_argument('--size', type=int, help="Default image size.",
default=96)
args = parser.parse_args()

sys.path = [args.dlibRoot] + sys.path
import openface
import openface.helper
from openface.data import iterImgs
from openface.alignment import NaiveDlib

main(args)
1 change: 0 additions & 1 deletion util/prune-dataset.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3

import argparse
from collections import defaultdict
import os
import shutil

Expand Down
3 changes: 0 additions & 3 deletions util/tsne.py
Expand Up @@ -12,9 +12,6 @@
import matplotlib.cm as cm
plt.style.use('bmh')

import os
import sys

import argparse

print("""
Expand Down

0 comments on commit dceb6a9

Please sign in to comment.