Add some interface n solver

Author: liuyu

clip

@@ -44,6 +44,50 @@
     function iter = iter(self)
       iter = caffe_('solver_get_iter', self.hSolver_self);
     end
+    % add new interfaces for solver
+    function use_caffemodel(self, model_dir)
+      for t = 1 : length(self.gpu_ids)
+          self.nets{t}.copy_from(model_dir);
+      end
+    end
+    function set_input_data(self, inputs)
+      for t = 1 : length(self.gpu_ids)
+          input_data = inputs{t};
+          self.nets{t}.set_input_data(input_data);
+      end
+    end
+    function output = get_output(self)
+      output = cell(length(self.gpu_ids), 1);
+      for t = 1 : length(self.gpu_ids)
+          output{t} = self.nets{t}.get_output();
+      end
+    end
+    function set_phase(self, phase)
+      for t = 1 : length(self.gpu_ids)
+          self.nets{t}.set_phase(phase);
+      end
+    end
+    function reshape_as_input(self, inputs)
+      for t = 1 : length(self.gpu_ids)
+          input_data = inputs{t};
+          self.nets{t}.reshape_as_input(input_data);
+      end
+    end
+    function forward(self, inputs)
+      for t = 1 : length(self.gpu_ids)
+          input_data = inputs{t};
+          self.nets{t}.set_input_data(input_data);
+      end
+      caffe_('solver_test');
+    end
+    function forward_prefilled(self)
+      caffe_('solver_test');
+    end
+    function snapshot(self, path)
+        self.nets{1}.save(path);
+    end
+    % add done
+    
     function max_iter = max_iter(self)
       max_iter = caffe_('solver_get_max_iter', self.hSolver_self);
     end

matlab/+caffe/Solver.m

@@ -442,6 +442,7 @@ static void solver_step(MEX_ARGS) {
 #pragma omp parallel num_threads(int(gpu_groups_[now_solver_].size())) 
   {
 	  int ID = omp_get_thread_num();
+	  Caffe::SetDevice(gpu_groups_[ now_solver_ ][ ID ]);
 	  if ( ID == 0 ){
 #ifdef DEBUG
 		  LOG(INFO) << "Card " << ID << " at point 0\n";
@@ -825,17 +826,15 @@ static void write_mean(MEX_ARGS) {
 
 // Usage: caffe_('solver_test')
 static void solver_test(MEX_ARGS) {
-	mxCHECK(nrhs == 1 && mxIsChar(prhs[ 0 ]),
-		"Usage: caffe_('read_mean', mean_proto_file)");
-	char* mean_proto_file = mxArrayToString(prhs[ 0 ]);
-	mxCHECK_FILE_EXIST(mean_proto_file);
-	Blob<float> data_mean;
-	BlobProto blob_proto;
-	bool result = ReadProtoFromBinaryFile(mean_proto_file, &blob_proto);
-	mxCHECK(result, "Could not read your mean file");
-	data_mean.FromProto(blob_proto);
-	plhs[ 0 ] = blob_to_mx_mat(&data_mean, DATA);
-	mxFree(mean_proto_file);
+#pragma omp parallel num_threads(int(gpu_groups_[ now_solver_ ].size())) 
+	{
+		int ID = omp_get_thread_num();
+		Caffe::SetDevice(gpu_groups_[ now_solver_ ][ ID ]);
+		if ( ID == 0 )
+			syncSolvers_[ now_solver_ ]->solver()->net()->ForwardPrefilled();
+		else
+			syncSolvers_[ now_solver_ ]->workers()[ ID ]->solver()->net()->ForwardPrefilled();
+	}
 }
 
 // Usage: caffe_('version')