merge release_1.0.6

Author: daisyden

Makefile

@@ -64,6 +64,11 @@ endif
 #################### MLSL ####################
 
 ifeq ($(USE_MLSL), 1)
+
+ifeq ($(CPU_ONLY), 0)
+$(error Multi-node is not supported if CPU_ONLY is disabled. Please set CPU_ONLY=1 if USE_MLSL=1)
+endif
+
 	RETURN_STRING=$(shell ./external/mlsl/prepare_mlsl.sh)
 	MLSL_ROOT=$(firstword $(RETURN_STRING))
 	MLSL_LDFLAGS=$(lastword $(RETURN_STRING))	

cmake/Dependencies.cmake

@@ -96,6 +96,10 @@ endif()
 
 # ---[ MLSL
 if(USE_MLSL)
+  if (NOT CPU_ONLY)
+    message(FATAL_ERROR "Multi-node is not supported if CPU_ONLY is disabled. Please set CPU_ONLY=1 if USE_MLSL=1.")
+  endif()
+
   #--find mlsl in external/mkl
   set(script_cmd "./external/mlsl/prepare_mlsl.sh" )
   execute_process(COMMAND ${script_cmd}

data/Celeb-A/celebA.txt

@@ -0,0 +1,10 @@
+/Celeb-A_Cropped/000001.jpg 1
+/Celeb-A_Cropped/000002.jpg 1
+/Celeb-A_Cropped/000003.jpg 1
+/Celeb-A_Cropped/000004.jpg 1
+/Celeb-A_Cropped/000005.jpg 1
+/Celeb-A_Cropped/000006.jpg 1
+/Celeb-A_Cropped/000007.jpg 1
+/Celeb-A_Cropped/000008.jpg 1
+/Celeb-A_Cropped/000009.jpg 1
+/Celeb-A_Cropped/000010.jpg 1

data/Celeb-A/crop_celebA.py

@@ -0,0 +1,59 @@
+from PIL import Image
+import os
+import sys
+
+print ""
+print "Prepare Celeb-A Dataset! (1. Crop the images. 2. Generate a train list file.)"
+print ""
+print "-------------------------------------------------------------------------------"
+
+current_path = os.getcwd()
+celebA_path = ""
+celebA_cropped_path = ""
+print "The current path containing this python file is: " + current_path
+if len(sys.argv) == 1:
+    print "Please give the path of original Celeb-A dataset!"
+    exit(0)
+elif len(sys.argv) > 1:
+    print "The path of original Celeb-A dataset is: " + str(sys.argv[1])
+    celebA_path = sys.argv[1]
+    celebA_cropped_path = os.path.dirname(celebA_path) + os.sep + "Cropped"     #To avoid crop the generated images again if this parameter is not provided
+    if len(sys.argv) > 2:
+        print "The path of cropped Celeb-A dataset will be: " + str(sys.argv[2])
+        celebA_cropped_path = sys.argv[2]
+    else:
+        print "The path of cropped Celeb-A dataset will be defult, set as: " + celebA_cropped_path
+
+if os.path.exists(celebA_cropped_path):
+    print "The path of cropped Celeb-A dataset exists."
+else:
+    print "The path of cropped Celeb-A dataset doesn't exist! I will create it now!"
+    os.makedirs(celebA_cropped_path)
+print "-------------------------------------------------------------------------------"
+
+training_list_file = os.path.join(celebA_cropped_path, "celebA.txt")
+list_file = open(training_list_file, 'w')
+total_image_num = 0
+x1, y1 = 30, 40
+cropped_box = (x1, y1, x1 + 138, y1 + 138)
+
+for parent,dirnames,filenames in os.walk(celebA_path):
+    for filename in filenames:
+        if filename.endswith(".jpg"):
+            total_image_num += 1
+            #print "parent is:" + parent
+            #print "filename is:" + filename
+            image_path_and_name = os.path.join(parent,filename)
+            print "the full name of the file is: " + image_path_and_name
+            input_image = Image.open(image_path_and_name)
+            #input_image.show()
+            cropped_image = input_image.crop(cropped_box)
+            #cropped_image.show()
+            scaled_cropped_image = cropped_image.resize((64, 64))
+            #scaled_cropped_image.show()
+            save_result_image_path_and_name = os.path.join(celebA_cropped_path,filename)
+            scaled_cropped_image.save(save_result_image_path_and_name, 'jpeg')
+            list_file.writelines(save_result_image_path_and_name)
+            list_file.writelines(" 1" + "\n")   #Must add label to list file
+print "There are " + str(total_image_num) + " images are finished with cropping and scaling operations!"
+list_file.close()

docker/standalone/cpu-centos/Dockerfile

@@ -4,7 +4,9 @@ MAINTAINER [email protected]
 #ENV http_proxy proxy:port
 #ENV https_proxy proxy:port
 
-RUN rpm -iUvh http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm
+RUN rpm -iUvh http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm
+
+RUN yum upgrade -y
 
 RUN yum install -y \
         redhat-rpm-config \
@@ -15,6 +17,7 @@ RUN yum install -y \
         cmake \
         git \
         wget \
+        ssh \
         atlas-devel \
         boost-devel \
         gflags-devel \

docker/standalone/cpu-ubuntu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 MAINTAINER [email protected]
 
 #ENV http_proxy proxy:port
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         cmake \
         git \
         wget \
+        ssh \
         libboost-all-dev \
         libgflags-dev \
         libgoogle-glog-dev \

docker/templates/Dockerfile.template

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         cmake \
         git \
         wget \
+        ssh \
         libatlas-base-dev \
         libboost-all-dev \
         libgflags-dev \

include/caffe/layers/mkldnn_layers.hpp

@@ -69,7 +69,7 @@ class MKLDNNBatchNormLayer : public MKLDNNLayer<Dtype>, public Layer<Dtype> {
         , bwd_top_diff(), bwd_bottom_diff()
         , BatchNormFwd_pd(), BatchNormBwd_pd()
         , scaleshift_memory(), bwd_scaleshift_diff_memory()
-        , output_memory(), bwd_bottom_diff_memory(), inplace_buffer_memory()
+        , output_memory(), bwd_bottom_diff_memory()
         , input_primitive(), bwd_top_diff_primitive()
         {
           PERFORMANCE_EVENT_ID_RESET(perf_id_fw_);
@@ -95,12 +95,10 @@ class MKLDNNBatchNormLayer : public MKLDNNLayer<Dtype>, public Layer<Dtype> {
     void InitBatchNormBwd(const vector<Blob<Dtype>*>& top,
             const vector<bool>& propagate_down,
             const vector<Blob<Dtype>*>& bottom);
-    void InitBatchNormFwdPrimitive(int stats_batch_idx, bool inplace);
-    void InitBatchNormBwdPrimitive(int stats_batch_idx, bool inplace);
+    void InitBatchNormFwdPrimitive(int stats_batch_idx);
+    void InitBatchNormBwdPrimitive(int stats_batch_idx);
     template <bool diff> shared_ptr<memory> GetStatsBatchMemory(
       shared_ptr<MKLDNNMemoryDescriptor<Dtype, diff> > mkldnn_data, int idx);
-    template <bool diff> shared_ptr<memory> GetStatsBatchMemoryInplace(
-      shared_ptr<MKLDNNMemoryDescriptor<Dtype, diff> > mkldnn_data, int idx, shared_ptr<memory > buffer_memory);
     void InitStatsBatchVars(int batch_size);
     shared_ptr<MKLDNNData<Dtype> > fwd_top_data, fwd_bottom_data;
     shared_ptr<MKLDNNDiff<Dtype> > bwd_top_diff, bwd_bottom_diff;
@@ -112,8 +110,8 @@ class MKLDNNBatchNormLayer : public MKLDNNLayer<Dtype>, public Layer<Dtype> {
 
     shared_ptr<memory> scaleshift_memory, bwd_scaleshift_diff_memory;
     shared_ptr<memory> output_memory, bwd_bottom_diff_memory;
-    shared_ptr<memory> inplace_buffer_memory;
-    vector<shared_ptr<memory> > input_stats, output_stats, top_diff_stats, bottom_diff_stats, input_inplace_buffer;
+
+    vector<shared_ptr<memory> > input_stats, output_stats, top_diff_stats, bottom_diff_stats;
 
     shared_ptr<primitive> input_primitive, bwd_top_diff_primitive;
 
@@ -124,6 +122,7 @@ class MKLDNNBatchNormLayer : public MKLDNNLayer<Dtype>, public Layer<Dtype> {
     int stats_batch_size_;
     shared_ptr<Blob<Dtype> > scaleshift_blob_;
     shared_ptr<Blob<Dtype> > scaleshift_acc_;
+    Blob<Dtype> inplace_buffer;
 
     PERFORMANCE_EVENT_ID_DECL(perf_id_fw_);
     PERFORMANCE_EVENT_ID_DECL(perf_id_bw_);
@@ -224,7 +223,7 @@ class MKLDNNInnerProductLayer : public MKLDNNLayer<Dtype> , public InnerProductL
                     , bwdd_top_diff_primitive, bwdd_weights_data_primitive
                     , bwdw_top_diff_primitive, bwdw_bottom_data_primitive;
     int32_t w_, h_;
-    
+
     /* In case of (iter_size > 1) we need additional buffers */
     shared_ptr<MKLDNNDiff<Dtype> > bwdw_weights_diff_iter, bwdw_bias_diff_iter;
     shared_ptr<memory> bwdw_weights_diff_memory_iter, bwdw_bias_diff_memory_iter;
@@ -322,13 +321,14 @@ class MKLDNNPoolingLayer : public MKLDNNLayer<Dtype>, public Layer<Dtype>  {
                                 ,const vector<Blob<Dtype>*>& bottom);
     virtual void Backward_gpu(const vector<Blob<Dtype>*>& top, const vector<bool>& propagate_down
                                 ,const vector<Blob<Dtype>*>& bottom);
+    virtual void compute_output_shape(const vector<Blob<Dtype>*>& bottom, const vector<Blob<Dtype>*>& top);
 
 private:
     void InitPoolingFwd(const vector<Blob<Dtype>*>& bottom, const vector<Blob<Dtype>*>& top);
     void InitPoolingBwd(const vector<Blob<Dtype>*>& bottom
                         , const vector<bool>& propagate_down
                         , const vector<Blob<Dtype>*>& top);
-  
+
     shared_ptr<MKLDNNData<Dtype>> fwd_bottom_data, fwd_top_data;
     shared_ptr<MKLDNNDiff<Dtype>> bwd_top_diff, bwd_bottom_diff;
     shared_ptr<pooling_forward::primitive_desc> poolingFwd_pd;
@@ -408,7 +408,7 @@ class MKLDNNConcatLayer : public MKLDNNLayer<Dtype> , public Layer<Dtype> {
             : MKLDNNLayer<Dtype>(), Layer<Dtype>(param),
             concatFwd_pd(), fwd_output_memory(),
             bwd_reorder_input_memory(), bwd_reorder_output_memory(),
-            fwd_top_data(), fwd_bottom_data(), split_channels() {
+            fwd_top_data(), fwd_bottom_data(), split_dims() {
               PERFORMANCE_EVENT_ID_RESET(perf_id_fw_);
               PERFORMANCE_EVENT_ID_RESET(perf_id_bw_);
     }
@@ -440,7 +440,7 @@ class MKLDNNConcatLayer : public MKLDNNLayer<Dtype> , public Layer<Dtype> {
     shared_ptr<MKLDNNDiff<Dtype> > bwd_top_diff;
     vector<shared_ptr<MKLDNNDiff<Dtype> > > bwd_bottom_diff;
     vector<MKLDNNPrimitive<Dtype> > reorders;
-    vector<int> split_channels;
+    vector<int> split_dims;
 
     int32_t num_, width_, height_, channels_, num_concats_;
     int concat_dimension;

include/caffe/mkldnn_base.hpp

@@ -196,6 +196,8 @@ class MKLDNNLayer {
 public:
     explicit MKLDNNLayer() {}
     virtual ~MKLDNNLayer() {}
+protected:
+    bool reshape;
 };
 
 // =====  MKLDNNPrimitive =======================================

include/caffe/net.hpp

@@ -326,6 +326,9 @@ class Net {
   /// @brief return whether NetState state meets NetStateRule rule
   static bool StateMeetsRule(const NetState& state, const NetStateRule& rule,
       const string& layer_name);
+  inline const map<string,int>& blob_names_index() const {
+    return blob_names_index_;
+  }
 
  protected:
   // Helpers for Init.