update news

Author: hopef

.gitignore

@@ -1,3 +1,4 @@
+/Build_pycaffe/
 /3rd/include
 /3rd/staticlib
 /Build

3rd/README.md

@@ -1,3 +1,7 @@
-如果要编译，请下载3rd.rar后解压缩到这个目录下
-
-https://pan.baidu.com/s/1Dc38GgfZ8TQ79ll162k_wA
+# 3rd
+请下载3rd.rar，解压到本目录即可
+目录结构如下：
+3rd:
+   --include
+   --staticlib
+   --README.md

README.md

@@ -1,5 +1,5 @@
 # CC4.0
-Caffe for CC4.0-Windows，简单的Caffe C++接口，方便简单而更深入的研究深度学习 a
+Caffe for CC4.0-Windows，简单的Caffe C++接口，方便简单而更深入的研究深度学习
 
 # 特性
 1.只需要一个头文件和一个依赖项libcaffe.lib<br/>
@@ -9,7 +9,6 @@ Caffe for CC4.0-Windows，简单的Caffe C++接口，方便简单而更深入的
 5.支持LSTM不定长OCR（有案例），支持SSD更轻易的训练起来<br/>
 6.有了4.0的支持，很轻易的能够实现任何新的网络结构<br/>
 7.可以允许通过自定义层，训练中查看训练效果，更加容易理解CNN在干嘛，学的效果怎么样，不再盲目了<br/>
-8.接口查看[cc.h](https://github.com/dlunion/CC4.0/blob/master/include/caffe/cc/core/cc.h)和[cc_utils.h](https://github.com/dlunion/CC4.0/blob/master/include/caffe/cc/core/cc_utils.h)
 
 # 编译
 编译环境：VS2013<br/>
@@ -21,8 +20,7 @@ CUDNN版本：5.0<br/>
 
 # 下载编译好的库文件和案例等数据
 推荐使用VS2013，下载后压缩包已经配置好环境和带好了OpenCV2.4.10静态库<br/>
-<del>[CC4.0.3.rar-百度网盘](https://pan.baidu.com/s/1OQDmxWwVpVohER2YMqGbZQ)</del>，里面的依赖可以用，但是头文件和libcaffe.dll不可用（因为有几个bug），等待重新编译并上传<br/>
-Win32-GPU编译，请下载[CUDA6.5 ToolKit](http://www.zifuture.com/fs/18.cc4.0/CUDAToolkit.rar)<br/>
+<del>[CC4.0.3.rar-百度网盘](https://pan.baidu.com/s/1OQDmxWwVpVohER2YMqGbZQ)</del>，里面的依赖可以用，但是头文件和libcaffe.dll不可用（因为有几个bug），等待重新编译并上传
 
 # 案例
 非常容易在C++里面实现自己的datalayer、losslayer等，自定义数据的输入等

include/caffe/cc/core/cc.h

@@ -37,6 +37,7 @@ namespace cc{
 	public:
 		operator char*(){ return get(); }
 		operator const char*(){ return get(); }
+		bool operator==(const char* str){ return strcmp(get(), str) == 0; }
 		CCString& operator=(const char* str){ set(str); return *this; }
 		CCString& operator=(char* str){ set(str); return *this; }
 		CCString& operator=(const CCString& str){ set(str.get(), str.len()); return *this; }
@@ -171,6 +172,28 @@ namespace cc{
 	};
 
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	//轻量级的Blob
+	class Blob;
+	struct CCAPI BlobData{
+		float* list;
+		int num;
+		int channels;
+		int height;
+		int width;
+		int capacity_count;		//保留空间的元素个数长度，字节数请 * sizeof(float)
+
+		BlobData();
+		virtual ~BlobData();
+		bool empty() const;
+		int count() const;
+		void reshape(int num, int channels, int height, int width);
+		void reshapeLike(const BlobData* other);
+		void copyFrom(const BlobData* other);
+		void copyFrom(const Blob* other);
+		void reshapeLike(const Blob* other);
+		void release();
+	};
+
 	class CCAPI Blob{
 	public:
 		void setNative(void* native);
@@ -200,6 +223,7 @@ namespace cc{
 		void Reshape(int numShape, int* shapeDims);
 		void ReshapeLike(const Blob& other);
 		void copyFrom(const Blob& other, bool copyDiff = false, bool reshape = false);
+		void copyFrom(const BlobData& other);
 		void setDataRGB(int numIndex, const Mat& data);
 		CCString shapeString();
 
@@ -219,6 +243,12 @@ namespace cc{
 		bool hasParam(const char* path);
 		CCString name();
 		MessageHandle* param();
+		int getNumBottom();
+		int getNumTop();
+		CCString bottomName(int index);
+		CCString topName(int index);
+		Blob* paramBlob(int index);
+		int getNumParamBlob();
 
 #ifdef USE_PROTOBUF
 		caffe::LayerParameter& layer_param();
@@ -273,8 +303,8 @@ namespace cc{
 		void* getNative();
 		int iter();
 		float smooth_loss();
-		void Restore(const char* resume_file);
-		void Snapshot();
+		void Restore(const char* solvestate_file);
+		void Snapshot(const char* caffemodel_savepath = 0, bool save_solver_state = true);
 		int max_iter();
 		void Solve();
 		void installActionSignalOperator();
@@ -300,8 +330,31 @@ namespace cc{
 	CCAPI void CCCALL releaseBlob(Blob* blob);
 	CCAPI void CCCALL releaseSolver(Solver* solver);
 	CCAPI void CCCALL releaseNet(Net* net);
-	CCAPI Solver* CCCALL loadSolverFromPrototxt(const char* solver_prototxt);
-	CCAPI Solver* CCCALL loadSolverFromPrototxtString(const char* solver_prototxt_string);
+	CCAPI Solver* CCCALL loadSolverFromPrototxt(const char* solver_prototxt, const char* netstring = 0);
+	CCAPI Solver* CCCALL loadSolverFromPrototxtString(const char* solver_prototxt_string, const char* netstring = 0);
+
+#ifdef USE_CC_PYTHON
+	class CCAPI CCPython{
+	public:
+		CCPython();
+		virtual ~CCPython();
+		bool load(const char* pyfile);
+		CCString callstringFunction(const CCString& name, CCString& errmsg = CCString());
+		CCString train_ptototxt();
+		CCString deploy_prototxt();
+		CCString solver();
+		CCString last_error();
+
+	private:
+		void* module_;
+		CCString lasterror_;
+	};
+
+	CCAPI Solver* CCCALL loadSolverFromPython(const char* pythonfile);
+
+	//phase指定加载train_prototxt还是deploy_prototxt
+	CCAPI Net* CCCALL loadNetFromPython(const char* pythonfile, const char* func="deploy_prototxt", int phase = PhaseTest);
+#endif
 
 #ifdef USE_PROTOBUF
 	CCAPI Solver* CCCALL newSolverFromProto(const caffe::SolverParameter* solver_param);
@@ -326,6 +379,21 @@ namespace cc{
 	CCAPI void CCCALL WriteProtoToBinaryFile(const google::protobuf::Message& proto, const char* filename);
 #endif
 
+
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class CCAPI LMDB{
+	public:
+		LMDB(const char* folder);
+		void put(const char* key, const void* data, int length);
+		void putAnnotatedDatum(const char* key, void* datum);
+		void putDatum(const char* key, void* datum);
+		void release();
+		virtual ~LMDB();
+
+	private:
+		void* native_;
+	};
+
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	class CCAPI AbstractCustomLayer{
 	public:
@@ -379,39 +447,44 @@ namespace cc{
 
 	class CCAPI DataLayer : public AbstractCustomLayer{
 	public:
-		DataLayer();
+		DataLayer(int batchCacheSize = 3, int watcherSize = 1);
 		virtual ~DataLayer();
 
-		virtual int getBatchCacheSize();
 		virtual void loadBatch(Blob** top, int numTop) = 0;
 		virtual void setup(const char* name, const char* type, const char* param_str, int phase, Blob** bottom, int numBottom, Blob** top, int numTop);
 		virtual void forward(Blob** bottom, int numBottom, Blob** top, int numTop);
-		virtual void reshape(Blob** bottom, int numBottom, Blob** top, int numTop){}
+		virtual void reshape(Blob** bottom, int numBottom, Blob** top, int numTop);
 		void stopBatchLoader();
+		int getWatcherIndex();
 		virtual int waitForDataTime();
+		void setPrintWaitData(bool wait);
 
 	private:
 		void setupBatch(Blob** top, int numTop);
-		static void watcher(DataLayer* ptr);
+		static void watcher(DataLayer* ptr, int ind);
 		void startWatcher();
 		void stopWatcher();
 		void pullBatch(Blob** top, int numTop);
 
 	private:
 		volatile bool keep_run_watcher_;
-		void* hsem_;
-		bool* batch_flags_;
-		Blob*** batch_;
+		void** hsem_;
+		bool** batch_flags_;
+		Blob**** batch_;					//batch_
 		int numTop_;
 		int cacheBatchSize_;
+		int watcherSize_;
+		void* watcher_map_;
+		bool print_waitdata_;
 	};
 
 	class CCAPI SSDDataLayer : public DataLayer{
 	public:
-		SSDDataLayer();
+		SSDDataLayer(int batchCacheSize = 3, int watcherSize = 1);
 		virtual ~SSDDataLayer();
 
 		virtual int getBatchCacheSize();
+		virtual int getWatcherSize();
 		virtual void loadBatch(Blob** top, int numTop);
 		virtual void setup(const char* name, const char* type, const char* param_str, int phase, Blob** bottom, int numBottom, Blob** top, int numTop);
 		virtual void* getAnnDatum() = 0;
@@ -435,6 +508,9 @@ namespace cc{
 	CCAPI void CCCALL releaseLabelMap(void* labelmap);
 	CCAPI void CCCALL releaseAnnDatum(void* datum);
 
+	CCAPI void* CCCALL loadDatum(const char* path, int label);
+	CCAPI void CCCALL releaseDatum(void* datum);
+
 
 	/////////////////////////////////////////////////////////////////////////////
 	CCAPI MessageHandle CCCALL loadMessageNetCaffemodel(const char* filename);