静态编码检查

Signed-off-by: Ntangshihua <tangshihua@huawei.com>

ai/neural_network_runtime/common/mock_idevice.cpp

@@ -164,7 +164,7 @@ int32_t MockIDevice::AllocateBuffer(uint32_t length, SharedBuffer &buffer)
     buffer.dataSize = length;
 
     m_ashmems[buffer.fd] = ashptr;
-    m_buffer_fd = buffer.fd;
+    m_bufferFd = buffer.fd;
     return HDF_SUCCESS;
 }
 
@@ -175,10 +175,10 @@ int32_t MockIDevice::ReleaseBuffer(const SharedBuffer &buffer)
     return HDF_SUCCESS;
 }
 
-int32_t MockIDevice::MemoryCopy(void *data, uint32_t length)
+int32_t MockIDevice::MemoryCopy(float *data, uint32_t length)
 {
     auto memManager = NeuralNetworkRuntime::MemoryManager::GetInstance();
-    auto memAddress = memManager->MapMemory(m_buffer_fd, length);
+    auto memAddress = memManager->MapMemory(m_bufferFd, length);
     if (memAddress == nullptr) {
         LOGE("[NNRtTest] Map fd to address failed.");
         return HDF_FAILURE;
@@ -198,7 +198,7 @@ int32_t MockIDevice::PrepareModel(const Model& model, const ModelConfig& config,
 }
 
 int32_t MockIDevice::PrepareModelFromModelCache(const std::vector<SharedBuffer>& modelCache, const ModelConfig& config,
-         sptr<IPreparedModel>& preparedModel)
+sptr<IPreparedModel>& preparedModel)
 {
     preparedModel = new (std::nothrow) V1_0::MockIPreparedModel();
     return HDF_SUCCESS;

ai/neural_network_runtime/common/mock_idevice.h

@@ -70,7 +70,7 @@ public:
     int32_t PrepareModelFromModelCache(const std::vector<SharedBuffer>& modelCache, const ModelConfig& config,
          sptr<IPreparedModel>& preparedModel) override;
 
-    int32_t MemoryCopy(void *data, uint32_t length);
+    int32_t MemoryCopy(float *data, uint32_t length);
 
     void SetFP16Supported(bool isSupported);
 
@@ -91,7 +91,7 @@ public:
 
 private:
     std::unordered_map<int, sptr<Ashmem>> m_ashmems;
-    int m_buffer_fd;
+    int m_bufferFd;
     bool m_fp16 = true;
     bool m_performance = true;
     bool m_priority = true;

ai/neural_network_runtime/common/nnrt_utils.cpp

@@ -35,8 +35,7 @@ int BuildMultiOpGraph(OH_NNModel *model, const OHNNGraphArgsMulti &graphArgs)
             const OHNNOperandTest &operandTem = graphArgs.operands[j][i];
             auto quantParam = operandTem.quantParam;
             OH_NN_Tensor operand = {operandTem.dataType, (uint32_t) operandTem.shape.size(),
-                                     operandTem.shape.data(),
-                                     quantParam, operandTem.type};
+            operandTem.shape.data(), quantParam, operandTem.type};
             ret = OH_NNModel_AddTensor(model, &operand);
             if (ret != OH_NN_SUCCESS) {
                 LOGE("[NNRtTest] OH_NNModel_AddTensor failed! ret=%d\n", ret);
@@ -85,8 +84,7 @@ int BuildSingleOpGraph(OH_NNModel *model, const OHNNGraphArgs &graphArgs)
         const OHNNOperandTest &operandTem = graphArgs.operands[i];
         auto quantParam = operandTem.quantParam;
         OH_NN_Tensor operand = {operandTem.dataType, (uint32_t) operandTem.shape.size(),
-                                 operandTem.shape.data(),
-                                 quantParam, operandTem.type};
+        operandTem.shape.data(), quantParam, operandTem.type};
         ret = OH_NNModel_AddTensor(model, &operand);
         if (ret != OH_NN_SUCCESS) {
             LOGE("[NNRtTest] OH_NNModel_AddTensor failed! ret=%d\n", ret);
@@ -196,7 +194,7 @@ int CompileGraphMock(OH_NNCompilation *compilation, const OHNNCompileParam &comp
 
 
 int ExecuteGraphMock(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs,
-                     void *expect)
+float* expect)
 {
     OHOS::sptr<V1_0::MockIDevice> device = V1_0::MockIDevice::GetInstance();
     int ret = 0;
@@ -236,7 +234,7 @@ int ExecuteGraphMock(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs,
     return ret;
 }
 
-int ExecutorWithMemory(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, OH_NN_Memory *OHNNMemory[], void *expect)
+int ExecutorWithMemory(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, OH_NN_Memory *OHNNMemory[], float *expect)
 {
     OHOS::sptr<V1_0::MockIDevice> device = V1_0::MockIDevice::GetInstance();
     int ret = 0;
@@ -278,7 +276,6 @@ int ExecutorWithMemory(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs,
             outputIndex += 1;
         }
     }
-
     ret = OH_NNExecutor_Run(executor);
     return ret;
 }
@@ -407,6 +404,7 @@ bool CreateFolder(const std::string &path)
         return false;
     }
     LOGI("CreateFolder:%s", path.c_str());
+    mode_t mode = 0700;
     for (int i = 1; i < path.size() - 1; i++) {
         if (path[i] != '/') {
             continue;
@@ -417,14 +415,14 @@ bool CreateFolder(const std::string &path)
                 continue;
             case PathType::NOT_FOUND:
                 LOGI("mkdir: %s", path.substr(0, i).c_str());
-                mkdir(path.substr(0, i).c_str(), 0700);
+                mkdir(path.substr(0, i).c_str(), mode);
                 break;
             default:
                 LOGI("error: %s", path.substr(0, i).c_str());
                 return false;
         }
     }
-    mkdir(path.c_str(), 0700);
+    mkdir(path.c_str(), mode);
     return CheckPath(path) == PathType::DIR;
 }
 

ai/neural_network_runtime/common/nnrt_utils.h

@@ -69,13 +69,14 @@ struct OHNNCompileParam {
 
 int BuildSingleOpGraph(OH_NNModel *modelptr, const OHNNGraphArgs &args);
 
-int ExecutorWithMemory(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, OH_NN_Memory *OHNNMemory[], void* expect);
+int ExecutorWithMemory(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, OH_NN_Memory *OHNNMemory[],
+float* expect);
 
 void Free(OH_NNModel *model = nullptr, OH_NNCompilation *compilation = nullptr, OH_NNExecutor *executor = nullptr);
 
 int CompileGraphMock(OH_NNCompilation *compilation, const OHNNCompileParam &compileParam);
 
-int ExecuteGraphMock(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, void* expect);
+int ExecuteGraphMock(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, float * expect);
 
 int SetDevice(OH_NNCompilation *compilation);
 int BuildMultiOpGraph(OH_NNModel *model, const OHNNGraphArgsMulti &graphArgs);

ai/neural_network_runtime/interface/src/CompileTest.cpp

@@ -38,7 +38,8 @@ public:
     {
         DeleteFolder(CACHE_DIR);
     }
-    void GenCacheFile() {
+    void GenCacheFile()
+    {
         OH_NNModel *model = OH_NNModel_Construct();
         ASSERT_NE(nullptr, model);
         ASSERT_EQ(OH_NN_SUCCESS, BuildSingleOpGraph(model, graphArgs));
@@ -53,15 +54,16 @@ public:
         ASSERT_TRUE(CheckPath(CACHE_PATH) == PathType::FILE);
         ASSERT_TRUE(CheckPath(CACHE_INFO_PATH) == PathType::FILE);
     }
-    void DestroyCache() {
+    void DestroyCache()
+    {
         std::ifstream ifs(CACHE_PATH.c_str(), std::ios::in | std::ios::binary);
         char* ptr{nullptr};
-        int cache_size = ifs.tellg();
-        int invalid_cache_size = cache_size * 0.9;
-        ifs.read(ptr, cache_size);
+        int cacheSize = ifs.tellg();
+        int invalidCacheSize = cacheSize * 0.9;
+        ifs.read(ptr, cacheSize);
         ifs.close();
         std::ofstream ofs(CACHE_PATH.c_str(), std::ios::out | std::ios::binary);
-        ofs.write(ptr, invalid_cache_size);
+        ofs.write(ptr, invalidCacheSize);
         ofs.close();
     }
 

ai/neural_network_runtime/interface/src/ExecutorTest.cpp

@@ -28,14 +28,6 @@ using namespace OHOS::HDI::Nnrt::V1_0;
 namespace {
 
 class ExecutorTest : public testing::Test {
-public:
-    void SetUp()
-    {      
-    }
-    void TearDown()
-    {
-    }
-
 protected:
     OHOS::sptr<V1_0::MockIDevice> device;
     AddModel addModel;
@@ -43,7 +35,7 @@ protected:
     OHNNCompileParam compileParam;
 };
 
-void ExecuteModel(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, void* expect)
+void ExecuteModel(OH_NNExecutor *executor, const OHNNGraphArgs &graphArgs, float* expect)
 {
     ASSERT_EQ(OH_NN_SUCCESS, ExecuteGraphMock(executor, graphArgs, expect));
 }

ai/neural_network_runtime/interface/src/MemoryTest.cpp

@@ -29,14 +29,6 @@ using namespace OHOS::HDI::Nnrt::V1_0;
 namespace {
 
 class MemoryTest : public testing::Test {
-public:
-    void SetUp()
-    {
-    }
-    void TearDown()
-    {
-    }
-
 protected:
     AddModel addModel;
     OHNNGraphArgs graphArgs = addModel.graphArgs;