# Project: cbir_binary_code
# File: DeepFeaturesExtractor
# Written by: Romuald FOTSO
# Licensed: MIT License
# Copyright (c) 2017

from feat_tools import pycaffe_batch_feat
from feat_tools import pycaffe_init_feat

class DeepFeaturesExtractor:

    def __init__(self, use_gpu, feat_len, model_prototxt, model_file,
                 ilsvrc_2012_mean_pn):
        self.use_gpu = use_gpu
        self.feat_len = feat_len
        self.model_prototxt = model_prototxt
        self.model_file = model_file
        self.ilsvrc_2012_mean_pn = ilsvrc_2012_mean_pn
        self.caffe_net = pycaffe_init_feat(use_gpu, model_prototxt, model_file)

    def extract(self, list_im, layer_n):
        print '------------------------------------------------'
        print '[2] Extraction of deep features at layer {}'.format(layer_n)
        print '------------------------------------------------'
        df_l7 = None
        if self.caffe_net != None:
            df_l7 = pycaffe_batch_feat(list_im, self.caffe_net,
                                       self.feat_len, self.ilsvrc_2012_mean_pn, layer_n)
        else:
            print 'DeepFeaturesExtractor>extract: Error, caffe_net is not defined'
        return df_l7

@@ -69,15 +69,14 @@
 by: 
-Romuald
+Franck
  FOT

Update DeepFeaturesExtractor.py