catalog rebuild

unsky · Oct 20, 2018 · bd52b2a · bd52b2a
1 parent f9d997b
commit bd52b2a
Show file tree

Hide file tree

Showing 24 changed files with 101 additions and 41 deletions.
diff --git a/include/sita/filler/filler.h b/include/sita/filler/filler.h
@@ -0,0 +1,34 @@
+//
+// Created by unsky on 02/07/18.
+//
+
+#ifndef SITA_FILLER_FILLER_H
+#define SITA_FILLER_FILLER_H
+#include <vector>
+#include <glog/logging.h>
+#include <string>
+#include "sita/macros.h"
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/text_format.h>
+#include "sita/proto/sita.h"
+#include "sita/io_protobuff.h"
+namespace sita{
+
+class Filler{
+public:
+ Filler(std::string model_file);
+ ~Filler(){};
+ void graph_symbol_show();
+ GraphParameter * graph_sym(){
+ return &_graph;}
+
+private:
+ GraphParameter _graph;
+
+};
+
+}//namespace
+
+
+#endif //SITA_STUFF_GRAPH_H
diff --git a/include/sita/dlflow/graph.h → include/sita/graph.h b/include/sita/dlflow/graph.h → include/sita/graph.h
@@ -2,8 +2,8 @@
 // Created by unsky on 02/07/18.
 //
 
-#ifndef SITA_DLFLOW_GRAPH_H
-#define SITA_DLFLOW_GRAPH_H
+#ifndef SITA_GRAPH_H
+#define SITA_GRAPH_H
 #include <vector>
 #include <glog/logging.h>
 #include <string>
@@ -21,7 +21,8 @@ class Graph{
  ~Graph(){};
  void graph_symbol_show();
  GraphParameter * graph_sym(){
- return &_graph;}
+ return &_graph;
+ }
 
 private:
  GraphParameter _graph;

diff --git a/include/sita/metric/metric.h b/include/sita/metric/metric.h
@@ -0,0 +1,34 @@
+//
+// Created by unsky on 02/07/18.
+//
+
+#ifndef SITA_METRIC_METRIC_H
+#define SITA_METRIC_METRIC_H
+#include <vector>
+#include <glog/logging.h>
+#include <string>
+#include "sita/macros.h"
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/text_format.h>
+#include "sita/proto/sita.h"
+#include "sita/io_protobuff.h"
+namespace sita{
+
+class Metric{
+public:
+ Metric(std::string model_file);
+ ~Metric(){};
+ void graph_symbol_show();
+ GraphParameter * graph_sym(){
+ return &_graph;}
+
+private:
+ GraphParameter _graph;
+
+};
+
+}//namespace
+
+
+#endif //SITA_STUFF_GRAPH_H
diff --git a/include/sita/mlflow/mlflow.h b/include/sita/mlflow/mlflow.h
diff --git a/include/sita/dlflow/operator.h → include/sita/operator.h b/include/sita/dlflow/operator.h → include/sita/operator.h
@@ -2,8 +2,8 @@
 // Created by unsky on 03/07/18.
 //
 
-#ifndef SITA_DLFLOW_OPERATORS_H
-#define SITA_DLFLOW_OPERATORS_H
+#ifndef SITA_OPERATORS_H
+#define SITA_OPERATORS_H
 #include <vector>
 #include <string>
 #include "sita/macros.h"

diff --git a/include/sita/dlflow/operators/batch_norm.h → include/sita/operators/batch_norm.h b/include/sita/dlflow/operators/batch_norm.h → include/sita/operators/batch_norm.h
@@ -2,9 +2,9 @@
 // Created by unsky on 15/08/18.
 //
 
-#ifndef SITA_DLFLOW_BATCH_NORM_H
-#define SITA_DLFLOW_BATCH_NORM_H
-#include "sita/dlflow/operator.h"
+#ifndef SITA_OPERATORS_BATCH_NORM_H
+#define SITA_OPERATORS_BATCH_NORM_H
+#include "sita/operator.h"
 #include "sita/proto/sita.h"
 namespace sita{
 
@@ -38,4 +38,4 @@ class BatchNorm: public Operator<Dtype>{
  bool _handles_setup;
 };
 }
-#endif //SITA_DLFLOW_BATCH_NORM_H
+#endif //SITA_OPERATORS_BATCH_NORM_H
diff --git a/include/sita/dlflow/operators/convolution.h → include/sita/operators/convolution.h b/include/sita/dlflow/operators/convolution.h → include/sita/operators/convolution.h
@@ -2,9 +2,9 @@
 // Created by unsky on 15/08/18.
 //
 
-#ifndef SITA_DLFLOW_CONVOLUTION_H
-#define SITA_DLFLOW_CONVOLUTION_H
-#include "sita/dlflow/operator.h"
+#ifndef SITA_OPERATORS_CONVOLUTION_H
+#define SITA_OPERATORS_CONVOLUTION_H
+#include "sita/operator.h"
 #include "sita/proto/sita.h"
 namespace sita{
 
@@ -54,4 +54,4 @@ class Convolution: public Operator<Dtype>{
 
 };
 }
-#endif //SITA_DLFLOW_CONVOLUTION_H
+#endif //SITA_OPERATORS_CONVOLUTION_H
diff --git a/include/sita/dlflow/operators/relu.h → include/sita/operators/relu.h b/include/sita/dlflow/operators/relu.h → include/sita/operators/relu.h
@@ -2,9 +2,9 @@
 // Created by unsky on 15/08/18.
 //
 
-#ifndef SITA_DLFLOW_RELU_H
-#define SITA_DLFLOW_RELU_H
-#include "sita/dlflow/operator.h"
+#ifndef SITA_OPERATORS_RELU_H
+#define SITA_OPERATORS_RELU_H
+#include "sita/operator.h"
 #include "sita/proto/sita.h"
 namespace sita{
 
@@ -35,4 +35,4 @@ class ReLU: public Operator<Dtype>{
  bool _handles_setup;
 };
 }
-#endif //SITA_DLFLOW_BATCH_NORM_H
+#endif //SITA_OPERATORS_BATCH_NORM_H
diff --git a/include/sita/dlflow/dlflower.h → include/sita/optimizer/optimizer.h b/include/sita/dlflow/dlflower.h → include/sita/optimizer/optimizer.h
diff --git a/include/sita/dlflow/registry.h → include/sita/registry.h b/include/sita/dlflow/registry.h → include/sita/registry.h
@@ -1,8 +1,8 @@
 //
 // Created by unsky on 03/07/18.
 //
-#ifndef SITA_DLFLOW_REGISTRY_H_
-#define SITA_DLFLOW_REGISTRY_H_
+#ifndef SITA_REGISTRY_H
+#define SITA_REGISTRY_H
 
 
 #include "sita/macros.h"

diff --git a/include/sita/tensor.h b/include/sita/tensor.h
@@ -1,8 +1,8 @@
 //---------------------------------
 //write by unsky
 //---------------------------------
-#ifndef SITA_TENSOR_H_
-#define SITA_TENSOR_H_
+#ifndef SITA_TENSOR_H
+#define SITA_TENSOR_H
 
 #include <vector>
 #include <iostream>

diff --git a/include/sita/workspace.h b/include/sita/workspace.h
@@ -1,8 +1,8 @@
 //---------------------------------
 //write by unsky
 //---------------------------------
-#ifndef SITA_WORKSPACE_H_
-#define SITA_WORKSPACE_H_
+#ifndef SITA_WORKSPACE_H
+#define SITA_WORKSPACE_H
 #include <vector>
 #include <map>
 #include <set>
@@ -11,7 +11,7 @@
 #include "tensor.h"
 #include "context.h"
 #include "macros.h"
-#include "sita/dlflow/graph.h"
+#include "sita/graph.h"
 #include "types.h"
 #include "sita/dataprovider/mnist_dataprovider.h"
 #include "sita/dataprovider/dataprovider.h"

diff --git a/include/sita/islets/islet.h → src/sita/filler/filler.cpp b/include/sita/islets/islet.h → src/sita/filler/filler.cpp
diff --git a/src/sita/dlflow/graph.cpp → src/sita/graph.cpp b/src/sita/dlflow/graph.cpp → src/sita/graph.cpp
@@ -1,7 +1,7 @@
 //
 // Created by unsky on 02/07/18.
 //
-#include "sita/dlflow/graph.h"
+#include "sita/graph.h"
 namespace sita{
 
 Graph::Graph(std::string model_file){

diff --git a/src/sita/islets/islet.cpp → src/sita/metric/metric.cpp b/src/sita/islets/islet.cpp → src/sita/metric/metric.cpp
diff --git a/src/sita/dlflow/operator.cpp → src/sita/operator.cpp b/src/sita/dlflow/operator.cpp → src/sita/operator.cpp
@@ -1,7 +1,7 @@
 //
 // Created by unsky on 27/06/18.
 //
-#include "sita/dlflow/operator.h"
+#include "sita/operator.h"
 namespace sita{
 
 template<typename Dtype>

diff --git a/src/sita/dlflow/operators/batch_norm.cpp → src/sita/operators/batch_norm.cpp b/src/sita/dlflow/operators/batch_norm.cpp → src/sita/operators/batch_norm.cpp
@@ -1,4 +1,4 @@
-#include "sita/dlflow/operators/batch_norm.h"
+#include "sita/operators/batch_norm.h"
 namespace sita{
 
 template <typename Dtype>

diff --git a/src/sita/dlflow/operators/batch_norm.cu → src/sita/operators/batch_norm.cu b/src/sita/dlflow/operators/batch_norm.cu → src/sita/operators/batch_norm.cu
@@ -1,4 +1,4 @@
-#include "sita/dlflow/operators/batch_norm.h"
+#include "sita/operators/batch_norm.h"
 namespace sita{
 template<typename Dtype>
 void BatchNorm<Dtype>::forward(){

diff --git a/src/sita/dlflow/operators/convolution.cpp → src/sita/operators/convolution.cpp b/src/sita/dlflow/operators/convolution.cpp → src/sita/operators/convolution.cpp
@@ -1,7 +1,7 @@
 //
 // Created by unsky on 16/08/18.
 //
-#include "sita/dlflow/operators/convolution.h"
+#include "sita/operators/convolution.h"
 namespace sita{
 template<typename Dtype>
 Convolution<Dtype>::~Convolution(){

diff --git a/src/sita/dlflow/operators/convolution.cu → src/sita/operators/convolution.cu b/src/sita/dlflow/operators/convolution.cu → src/sita/operators/convolution.cu
@@ -1,4 +1,4 @@
-#include "sita/dlflow/operators/convolution.h"
+#include "sita/operators/convolution.h"
 namespace sita{
 
 __global__ void sync_conv_groups() { }

diff --git a/src/sita/dlflow/operators/relu.cpp → src/sita/operators/relu.cpp b/src/sita/dlflow/operators/relu.cpp → src/sita/operators/relu.cpp
@@ -1,4 +1,4 @@
-#include "sita/dlflow/operators/relu.h"
+#include "sita/operators/relu.h"
 namespace sita{
 
 template <typename Dtype>

diff --git a/src/sita/dlflow/operators/relu.cu → src/sita/operators/relu.cu b/src/sita/dlflow/operators/relu.cu → src/sita/operators/relu.cu
@@ -1,4 +1,4 @@
-#include "sita/dlflow/operators/relu.h"
+#include "sita/operators/relu.h"
 namespace sita{
 template<typename Dtype>
 void ReLU<Dtype>::forward(){

diff --git a/src/sita/mlflow/mlflow.cpp → src/sita/optimizer/optimizer.cpp b/src/sita/mlflow/mlflow.cpp → src/sita/optimizer/optimizer.cpp
diff --git a/tools/sita.cpp b/tools/sita.cpp
@@ -16,7 +16,6 @@ int main(int argc, char** argv) {
  std::string model_file = "../test.prototxt";
  sita::Graph graph(model_file);
 
-
  std::vector<float> means;
  means.push_back(float(0));
  sita::MnistDataProvider<float > mnistdp("../data/mnist/train-images-idx3-ubyte",