caffe

tests/ci_build/Dockerfile.caffe_gpu

@@ -0,0 +1,24 @@
+FROM nvidia/cuda:7.5-cudnn5-devel
+
+COPY install/ubuntu_*.sh /install/
+
+RUN /install/ubuntu_install_core.sh
+RUN /install/ubuntu_install_python.sh
+
+RUN apt-get install -y libprotobuf-dev libleveldb-dev \
+    libsnappy-dev libopencv-dev libhdf5-serial-dev protobuf-compiler \
+    libatlas-base-dev python-dev libgflags-dev libgoogle-glog-dev liblmdb-dev \
+    python-numpy
+
+RUN apt-get install -y --no-install-recommends libboost-all-dev
+
+RUN cd /; git clone http://github.com/BVLC/caffe.git; cd caffe; \
+    cp Makefile.config.example Makefile.config
+
+RUN echo "CPU_ONLY := 1" >> /caffe/Makefile.config
+
+RUN cd caffe; make all pycaffe -j$(nproc)
+
+RUN cd caffe/python; for req in $(cat requirements.txt); do pip2 install $req; done
+
+ENV PYTHONPATH=${PYTHONPATH}:/caffe/python

tools/caffe_converter/convert_caffe_modelzoo.py

@@ -37,14 +37,16 @@
     },
     'vgg-16' : {
         'prototxt' : 'https://gist.githubusercontent.com/ksimonyan/211839e770f7b538e2d8/raw/c3ba00e272d9f48594acef1f67e5fd12aff7a806/VGG_ILSVRC_16_layers_deploy.prototxt',
-        'caffemodel' : 'http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_16_layers.caffemodel' ,
+        # 'caffemodel' : 'http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_16_layers.caffemodel',
+        'caffemodel' : 'http://data.mxnet.io/models/imagenet/test/caffe/VGG_ILSVRC_16_layers.caffemodel',
         'mean': (123.68,116.779,103.939),
         'top-1-acc' : 0.734,
         'top-5-acc' : 0.914
     },
     'vgg-19' : {
         'prototxt' : 'https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt',
-        'caffemodel' : 'http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel',
+        # 'caffemodel' : 'http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel',
+        'caffemodel' : 'http://data.mxnet.io/models/imagenet/test/caffe/VGG_ILSVRC_19_layers.caffemodel',
         'mean' : (123.68,116.779,103.939),
         'top-1-acc' : 0.731,
         'top-5-acc' : 0.913
@@ -76,34 +78,19 @@ def get_model_meta_info(model_name):
     """returns a dict with model information"""
     return dict(dict(model_meta_info)[model_name])
 
-def _download_file(url, local_fname=None, force_write=False):
-    """download a file by using the given URL"""
-    if local_fname is None:
-        local_fname = url.split('/')[-1]
-    if not force_write and os.path.exists(local_fname):
-        return local_fname
-
-    r = requests.get(url, stream=True)
-    assert r.status_code == 200, "failed to open %s" % url
-    with open(local_fname, 'wb') as f:
-        for chunk in r.iter_content(chunk_size=1024):
-            if chunk: # filter out keep-alive new chunks
-                f.write(chunk)
-    return local_fname
-
 def _download_caffe_model(model_name, meta_info, dst_dir='./model'):
     """Download caffe model into disk by the given meta info """
     if not os.path.isdir(dst_dir):
         os.mkdir(dst_dir)
     model_name = os.path.join(dst_dir, model_name)
     assert 'prototxt' in meta_info, "missing prototxt url"
-    prototxt = _download_file(meta_info['prototxt'], model_name+'_deploy.prototxt')
+    prototxt = mx.test_utils.download(meta_info['prototxt'], model_name+'_deploy.prototxt')
     assert 'caffemodel' in meta_info, "mssing caffemodel url"
-    caffemodel = _download_file(meta_info['caffemodel'], model_name+'.caffemodel')
+    caffemodel = mx.test_utils.download(meta_info['caffemodel'], model_name+'.caffemodel')
     assert 'mean' in meta_info, 'no mean info'
     mean = meta_info['mean']
     if isinstance(mean, str):
-        mean = _download_file(mean, model_name+'_mean.binaryproto')
+        mean = mx.test_utils.download(mean, model_name+'_mean.binaryproto')
     return (prototxt, caffemodel, mean)
 
 def convert_caffe_model(model_name, meta_info, dst_dir='./model'):

tools/caffe_converter/convert_symbol.py

@@ -12,7 +12,7 @@ def _get_input(proto):
     elif len(proto.input_shape) > 0:
         input_dim = proto.input_shape[0].dim
     elif layer[0].type == "Input":
-        input_dim = layer[0].input_param.shape._values[0].dim
+        input_dim = layer[0].input_param.shape[0].dim
         layer.pop(0)
     else:
         raise ValueError('Cannot find input size')

tools/caffe_converter/test_converter.py

@@ -29,6 +29,7 @@ def test_imagenet_model(model_name, val_data, gpus, batch_size):
                      metrics=acc,
                      gpus=gpus,
                      batch_size=batch_size,
+                     max_num_examples=500,
                      **mean_args)
     logging.info('speed : %f image/sec', speed)
     for a in acc:
@@ -41,7 +42,7 @@ def test_imagenet_model(model_name, val_data, gpus, batch_size):
     assert len(gpus) > 0
     batch_size = 32 * len(gpus)
 
-    models = ['bvlc_googlenet', 'vgg-16', 'vgg-19', 'resnet-50']
+    models = ['bvlc_googlenet', 'vgg-16', 'resnet-50']
 
     val = download_data()
     for m in models: