format files

test/CMakeLists.txt

 
+set(dir ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${dir}/build")
+
 # gen test
-ADD_EXECUTABLE(test-conv-op  operators/test_cov_op.cpp test_helper.h  test_include.h framework/executor_for_test.h framework/executor_for_test.cpp)
+ADD_EXECUTABLE(test-conv-op  operators/test_cov_op.cpp test_helper.h  test_include.h executor_for_test.h)
 target_link_libraries(test-conv-op paddle-mobile)
 
 # gen test
@@ -46,11 +49,11 @@ target_link_libraries(test-optimize paddle-mobile)
 
 
 #gen test
-ADD_EXECUTABLE(test-pool operators/test_pool_op.cpp test_helper.h test_include.h framework/executor_for_test.h framework/executor_for_test.cpp)
+ADD_EXECUTABLE(test-pool operators/test_pool_op.cpp test_helper.h test_include.h executor_for_test.h)
 target_link_libraries(test-pool paddle-mobile)
 
 #gen test
-ADD_EXECUTABLE(test-softmax operators/test_softmax_op.cpp test_helper.h test_include.h framework/executor_for_test.h framework/executor_for_test.cpp)
+ADD_EXECUTABLE(test-softmax operators/test_softmax_op.cpp test_helper.h test_include.h executor_for_test.h)
 target_link_libraries(test-softmax paddle-mobile)
 
 # gen test

test/framework/executor_for_test.h → test/executor_for_test.h

@@ -33,8 +33,43 @@ using std::string;
 template <typename DeviceType, typename OpType>
 class Executor4Test : public Executor<DeviceType> {
  public:
-  Executor4Test(Program<DeviceType> p, string op_type);
+  Executor4Test(Program<DeviceType> p, string op_type)
+      : Executor<DeviceType>(p) {
+    if (this->program_.originProgram == nullptr) {
+      LOG(paddle_mobile::LogLevel::kLOG_ERROR)
+          << "to_predict_program_ == nullptr";
+    }
+    const std::vector<std::shared_ptr<BlockDesc>> blocks =
+        this->to_predict_program_->Blocks();
+    for (std::shared_ptr<BlockDesc> block_desc : blocks) {
+      std::vector<std::shared_ptr<OpDesc>> ops = block_desc->Ops();
+      for (std::shared_ptr<OpDesc> op : ops) {
+        if (op->Type() == op_type) {
+          std::shared_ptr<OpType> op_ptr = std::make_shared<OpType>(
+              op->Type(), op->GetInputs(), op->GetOutputs(), op->GetAttrMap(),
+              this->program_.scope);
+
+          this->ops_of_block_[*block_desc.get()].push_back(op_ptr);
+          break;
+        }
+      }
+    }
+  }
 
   std::shared_ptr<Tensor> predict(const Tensor &t, string input, string output,
-                                  const DDim &dDim);
+                                  const DDim &dDim) {
+    auto scope = this->program_.scope;
+    Variable *g_feed_value = scope->Var(input);
+    auto tensor = g_feed_value->GetMutable<Tensor>();
+    tensor->ShareDataWith(t);
+
+    Variable *con_output = scope->Var(output);
+    auto *output_tensor = con_output->GetMutable<Tensor>();
+    output_tensor->mutable_data<float>(dDim);
+    std::shared_ptr<Tensor> out_tensor = std::make_shared<LoDTensor>();
+    out_tensor.reset(output_tensor);
+
+    Executor<DeviceType>::predict(t, 0);
+    return out_tensor;
+  }
 };

test/framework/executor_for_test.cpp

-/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#include "framework/executor_for_test.h"
-
-template <typename DeviceType, typename OpType>
-Executor4Test<DeviceType, OpType>::Executor4Test(const Program<DeviceType> p,
-                                                 std::string op_type)
-    : Executor<DeviceType>(p) {
-  if (this->program_.originProgram == nullptr) {
-    LOG(paddle_mobile::LogLevel::kLOG_ERROR)
-        << "to_predict_program_ == nullptr";
-  }
-
-  const std::vector<std::shared_ptr<BlockDesc>> blocks =
-      this->to_predict_program_->Blocks();
-
-  for (std::shared_ptr<BlockDesc> block_desc : blocks) {
-    std::vector<std::shared_ptr<OpDesc>> ops = block_desc->Ops();
-    for (std::shared_ptr<OpDesc> op : ops) {
-      if (op->Type() == op_type) {
-        std::shared_ptr<OpType> op_ptr = std::make_shared<OpType>(
-            op->Type(), op->GetInputs(), op->GetOutputs(), op->GetAttrMap(),
-            this->program_.scope);
-
-        this->ops_of_block_[*block_desc.get()].push_back(op_ptr);
-        break;
-      }
-    }
-  }
-}
-
-template <typename DeviceType, typename OpType>
-std::shared_ptr<Tensor> Executor4Test<DeviceType, OpType>::predict(
-    const Tensor &t, std::string input, std::string output, const DDim &dDim) {
-  auto scope = this->program_.scope;
-  Variable *g_feed_value = scope->Var(input);
-  auto tensor = g_feed_value->GetMutable<Tensor>();
-  tensor->ShareDataWith(t);
-
-  Variable *con_output = scope->Var(output);
-  auto *output_tensor = con_output->GetMutable<Tensor>();
-  output_tensor->mutable_data<float>(dDim);
-  std::shared_ptr<Tensor> out_tensor = std::make_shared<LoDTensor>();
-  out_tensor.reset(output_tensor);
-
-  Executor<DeviceType>::predict(t, 0);
-  return out_tensor;
-}
-
-template class Executor4Test<
-    paddle_mobile::CPU,
-    paddle_mobile::operators::ConvOp<paddle_mobile::CPU, float>>;
-template class Executor4Test<
-    paddle_mobile::CPU,
-    paddle_mobile::operators::PoolOp<paddle_mobile::CPU, float>>;
-template class Executor4Test<
-    paddle_mobile::CPU,
-    paddle_mobile::operators::SoftmaxOp<paddle_mobile::CPU, float>>;

test/framework/test_load.cpp

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "/io.h"
+#include "io.h"
 
 int main() {
   paddle_mobile::Loader<paddle_mobile::CPU> loader;

test/framework/test_optimize.cpp

@@ -12,21 +12,21 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "/io.h"
+#include "io.h"
 #include "framework/program/program-optimize/node.h"
 #include "framework/program/program-optimize/program_optimize.h"
 
 int main() {
-  Loader<paddle_mobile::CPU> loader;
+  paddle_mobile::Loader<paddle_mobile::CPU> loader;
   //    "../../../test/models/googlenet"
   auto program = loader.Load("../models/googlenet");
-  ProgramOptimize optimize;
+  paddle_mobile::framework::ProgramOptimize optimize;
   //  program.originProgram->Description("origin");
   auto optimize_program = optimize.FushionOptimize(program.originProgram);
   if (optimize_program != nullptr) {
     //    optimize_program->Description("optimize");
   } else {
-    LOG(kLOG_ERROR) << "optimize_program is null";
+    LOG(paddle_mobile::kLOG_ERROR) << "optimize_program is null";
   }
   return 0;
 }

test/operators/test_batchnorm_op.cpp

@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
+
+#include "../test_helper.h"
 #include "../test_include.h"
 #include "operators/batchnorm_op.h"
 

test/operators/test_cov_op.cpp

@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <io>
-#include "framework/executor_for_test.h"
-#include "framework/test_helper.h"
+#include "io.h"
+#include "../test_helper.h"
+#include "../executor_for_test.h"
 
 int main() {
   paddle_mobile::Loader<paddle_mobile::CPU> loader;

test/operators/test_pool_op.cpp

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "../framework/executor_for_test.h"
+#include "../executor_for_test.h"
 #include "../test_helper.h"
 #include "io.h"
 

test/operators/test_softmax_op.cpp

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "../framework/executor_for_test.h"
+#include "../executor_for_test.h"
 #include "../test_helper.h"
 #include "./io.h"
 

test/test_helper.h

@@ -12,10 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifndef TEST_TEST_INCLUDE_H_
-#define TEST_TEST_INCLUDE_H_
-
 #pragma once
+
 #include <random>
 #include "common/log.h"
 #include "framework/ddim.h"
@@ -33,5 +31,3 @@ void SetupTensor(paddle_mobile::framework::Tensor *input,
     input_ptr[i] = static_cast<T>(uniform_dist(rng) * (upper - lower) + lower);
   }
 }
-
-#endif

test/test_include.h

@@ -12,15 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifndef TEST_TEST_INCLUDE_H_
-#define TEST_TEST_INCLUDE_H_
+#pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "./test_helper.h"
-#include "/io.h"
 #include "framework/framework.pb.h"
 #include "framework/lod_tensor.h"
 #include "framework/operator.h"
@@ -30,5 +28,4 @@ limitations under the License. */
 #include "framework/scope.h"
 #include "framework/tensor.h"
 #include "framework/variable.h"
-
-#endif  // TEST_TEST_INCLUDE_H_
+#include "io.h"