for deeptext 310 inferenct

model_zoo/official/cv/crnn/ascend310_infer/src/main.cc

@@ -22,6 +22,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "include/api/model.h"
 #include "include/api/context.h"
@@ -120,7 +121,7 @@ int main(int argc, char **argv) {
     compose(ReadFileToTensor(allFiles[i]), &img);
 
     inputs.emplace_back(modelInputs[0].Name(), modelInputs[0].DataType(), modelInputs[0].Shape(),
-                            img.Data().get(), img.DataSize());
+                        img.Data().get(), img.DataSize());
 
     gettimeofday(&start, NULL);
     ret = model.Predict(inputs, &outputs);
@@ -136,7 +137,7 @@ int main(int argc, char **argv) {
   }
     double average = 0.0;
     int infer_cnt = 0;
-    char tmpCh[256] = {0};
+
     for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
         double diff = 0.0;
         diff = iter->second - iter->first;
@@ -145,11 +146,12 @@ int main(int argc, char **argv) {
     }
     average = average/infer_cnt;
 
-    snprintf(tmpCh, sizeof(tmpCh), "NN inference cost average time: %4.3f ms of infer_count %d \n", average, infer_cnt);
+    std::stringstream timeCost;
+    timeCost << "NN inference cost average time: "<< average << " ms of infer_count " << infer_cnt << std::endl;
     std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
     std::string file_name = "./time_Result" + std::string("/test_perform_static.txt");
     std::ofstream file_stream(file_name.c_str(), std::ios::trunc);
-    file_stream << tmpCh;
+    file_stream << timeCost.str();
     file_stream.close();
     costTime_map.clear();
   return 0;

model_zoo/official/cv/ctpn/ascend310_infer/src/main.cc

@@ -23,6 +23,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "../inc/utils.h"
 #include "minddata/dataset/include/execute.h"
@@ -141,7 +142,7 @@ int main(int argc, char **argv) {
     }
     double average = 0.0;
     int infer_cnt = 0;
-    char tmpCh[256] = {0};
+
     for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
         double diff = 0.0;
         diff = iter->second - iter->first;
@@ -149,13 +150,14 @@ int main(int argc, char **argv) {
         infer_cnt++;
     }
 
-    average = average/infer_cnt;
+    average = average / infer_cnt;
 
-    snprintf(tmpCh, sizeof(tmpCh), "NN inference cost average time: %4.3f ms of infer_count %d\n", average, infer_cnt);
+    std::stringstream timeCost;
+    timeCost << "NN inference cost average time: "<< average << " ms of infer_count " << infer_cnt << std::endl;
     std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
     std::string file_name = "./time_Result" + std::string("/test_perform_static.txt");
     std::ofstream file_stream(file_name.c_str(), std::ios::trunc);
-    file_stream << tmpCh;
+    file_stream << timeCost.str();
     file_stream.close();
     costTime_map.clear();
   return 0;

model_zoo/official/cv/ctpn/ascend310_infer/src/utils.cc

@@ -55,7 +55,7 @@ int WriteResult(const std::string& imageFile, const std::vector<MSTensor> &outpu
         std::string fileName(imageFile, pos + 1);
         fileName.replace(fileName.find('.'), fileName.size() - fileName.find('.'), '_' + std::to_string(i) + ".bin");
         std::string outFileName = homePath + "/" + fileName;
-        FILE * outputFile = fopen(outFileName.c_str(), "wb");
+        FILE *outputFile = fopen(outFileName.c_str(), "wb");
         fwrite(netOutput.get(), outputSize, sizeof(char), outputFile);
         fclose(outputFile);
         outputFile = nullptr;
@@ -118,7 +118,6 @@ std::string RealPath(std::string_view path) {
     char realPathMem[PATH_MAX] = {0};
     char *realPathRet = nullptr;
     realPathRet = realpath(path.data(), realPathMem);
-
     if (realPathRet == nullptr) {
         std::cout << "File: " << path << " is not exist.";
         return "";

model_zoo/official/cv/deeplabv3/ascend310_infer/src/main.cc

@@ -22,6 +22,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "include/api/context.h"
 #include "include/api/model.h"
@@ -197,7 +198,7 @@ int main(int argc, char **argv) {
   }
   double average = 0.0;
   int inferCount = 0;
-  char tmpCh[256] = {0};
+
   for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
     double diff = 0.0;
     diff = iter->second - iter->first;
@@ -205,12 +206,13 @@ int main(int argc, char **argv) {
     inferCount++;
   }
   average = average / inferCount;
-  snprintf(tmpCh, sizeof(tmpCh), \
-  "NN inference cost average time: %4.3f ms of infer_count %d \n", average, inferCount);
+  std::stringstream timeCost;
+  timeCost << "NN inference cost average time: "<< average << " ms of infer_count " << inferCount << std::endl;
   std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << inferCount << std::endl;
+
   std::string fileName = "./time_Result" + std::string("/test_perform_static.txt");
   std::ofstream fileStream(fileName.c_str(), std::ios::trunc);
-  fileStream << tmpCh;
+  fileStream << timeCost.str();
   fileStream.close();
   costTime_map.clear();
   return 0;

model_zoo/official/cv/faster_rcnn/ascend310_infer/src/AclProcess.cpp

@@ -142,7 +142,7 @@ int AclProcess::WriteResult(const std::string& imageFile) {
     void *resHostBuf = nullptr;
     for (size_t i = 0; i < outputBuffers_.size(); ++i) {
         size_t output_size;
-        void * netOutput;
+        void *netOutput;
         netOutput = outputBuffers_[i];
         output_size =  outputSizes_[i];
         int ret = aclrtMallocHost(&resHostBuf, output_size);
@@ -164,7 +164,7 @@ int AclProcess::WriteResult(const std::string& imageFile) {
 
         std::string outFileName = homePath + "/" + fileName;
         try {
-            FILE * outputFile = fopen(outFileName.c_str(), "wb");
+            FILE *outputFile = fopen(outFileName.c_str(), "wb");
             if (outputFile == nullptr) {
                 std::cout << "open result file " << outFileName << " failed" << std::endl;
                 return INVALID_POINTER;
@@ -299,17 +299,19 @@ int AclProcess::ModelInfer(std::map<double, double> *costTime_map) {
     if (ret != ACL_ERROR_NONE) {
         std::cout << "aclrtMalloc failed, ret = " << ret << std::endl;
         aclrtFree(imInfo_dst);
+        free(im_info);
         return ret;
     }
     ret = aclrtMemcpy(reinterpret_cast<uint8_t *>(imInfo_dst), 8, im_info, 8, ACL_MEMCPY_HOST_TO_DEVICE);
     if (ret != ACL_ERROR_NONE) {
         std::cout << "aclrtMemcpy failed, ret = " << ret << std::endl;
         aclrtFree(imInfo_dst);
+        free(im_info);
         return ret;
     }
 
     std::vector<void *> inputBuffers({resizeOutData->data, imInfo_dst});
-    std::vector<size_t> inputSizes({resizeOutData->dataSize, 4*2});
+    std::vector<size_t> inputSizes({resizeOutData->dataSize, 4 * 2});
 
     for (size_t i = 0; i < modelInfo_.outputNum; i++) {
         aclrtMemset(outputBuffers_[i], outputSizes_[i], 0, outputSizes_[i]);
@@ -318,6 +320,7 @@ int AclProcess::ModelInfer(std::map<double, double> *costTime_map) {
     ret = modelProcess_->ModelInference(inputBuffers, inputSizes, outputBuffers_, outputSizes_, costTime_map);
     if (ret != OK) {
         aclrtFree(imInfo_dst);
+        free(im_info);
         std::cout << "Failed to execute the classification model, ret = " << ret << "." << std::endl;
         return ret;
     }
@@ -327,6 +330,7 @@ int AclProcess::ModelInfer(std::map<double, double> *costTime_map) {
         std::cout << "aclrtFree image info failed" << std::endl;
         return ret;
     }
+    free(im_info);
     RELEASE_DVPP_DATA(resizeOutData->data);
     return OK;
 }

model_zoo/official/cv/faster_rcnn/ascend310_infer/src/DvppCommon.cpp

@@ -115,7 +115,7 @@ int DvppCommon::GetVpcDataSize(uint32_t width, uint32_t height, acldvppPixelForm
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetVpcInputStrideSize(uint32_t width, uint32_t height, acldvppPixelFormat format,
-                                            uint32_t *widthStride, uint32_t *heightStride) {
+                                      uint32_t *widthStride, uint32_t *heightStride) {
     uint32_t inputWidthStride;
     if (format >= PIXEL_FORMAT_YUV_400 && format <= PIXEL_FORMAT_YVU_SEMIPLANAR_444) {
         inputWidthStride = DVPP_ALIGN_UP(width, VPC_STRIDE_WIDTH);
@@ -156,7 +156,7 @@ int DvppCommon::GetVpcInputStrideSize(uint32_t width, uint32_t height, acldvppPi
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetVpcOutputStrideSize(uint32_t width, uint32_t height, acldvppPixelFormat format,
-                                             uint32_t *widthStride, uint32_t *heightStride) {
+                                       uint32_t *widthStride, uint32_t *heightStride) {
     if (format != PIXEL_FORMAT_YUV_SEMIPLANAR_420 && format != PIXEL_FORMAT_YVU_SEMIPLANAR_420) {
         std::cout << "Output format[" << format << "] is not supported, just support NV12 or NV21." << std::endl;
         return INVALID_PARAM;
@@ -348,7 +348,7 @@ int DvppCommon::ResizeWithPadding(std::shared_ptr<acldvppPicDesc> inputDesc,
     pasteAreaConfig_.reset(pastRoiCfg, g_roiConfigDeleter);
 
     int ret = acldvppVpcCropAndPasteAsync(dvppChannelDesc_, inputDesc.get(), outputDesc.get(), cropAreaConfig_.get(),
-                                                pasteAreaConfig_.get(), dvppStream_);
+                                          pasteAreaConfig_.get(), dvppStream_);
     if (ret != OK) {
         // release resource.
         std::cout << "Failed to crop and paste asynchronously, ret = " << ret << "." << std::endl;
@@ -574,7 +574,7 @@ void DvppCommon::GetJpegDecodeStrideSize(uint32_t width, uint32_t height,
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetJpegImageInfo(const void *data, uint32_t dataSize, uint32_t *width, uint32_t *height,
-                                       int32_t *components) {
+                                 int32_t *components) {
     uint32_t widthTmp;
     uint32_t heightTmp;
     int32_t componentsTmp;
@@ -608,7 +608,7 @@ int DvppCommon::GetJpegImageInfo(const void *data, uint32_t dataSize, uint32_t *
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetJpegDecodeDataSize(const void *data, uint32_t dataSize, acldvppPixelFormat format,
-                                            uint32_t *decSize) {
+                                      uint32_t *decSize) {
     uint32_t outputSize;
     int ret = acldvppJpegPredictDecSize(data, dataSize, format, &outputSize);
     if (ret != OK) {
@@ -632,7 +632,7 @@ int DvppCommon::CombineJpegdProcess(const RawData& imageInfo, acldvppPixelFormat
     inputImage_ = std::make_shared<DvppDataInfo>();
     inputImage_->format = format;
     int ret = GetJpegImageInfo(imageInfo.data.get(), imageInfo.lenOfByte, &(inputImage_->width), &(inputImage_->height),
-                                     &components);
+                               &components);
     if (ret != OK) {
         std::cout << "Failed to get input image info, ret = " << ret << "." << std::endl;
         return ret;

model_zoo/official/cv/faster_rcnn/ascend310_infer/src/ModelProcess.cpp

@@ -59,7 +59,7 @@ int ModelProcess::ModelInference(const std::vector<void *> &inputBufs,
     if (input == nullptr) {
         return INVALID_POINTER;
     }
-    int ret = 0;
+    int ret;
 
     aclmdlDataset *output = nullptr;
     output = CreateAndFillDataset(ouputBufs, outputSizes);

model_zoo/official/cv/faster_rcnn/ascend310_infer/src/main.cpp

@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <cstring>
 #include <fstream>
+#include <sstream>
 #include "../inc/AclProcess.h"
 #include "../inc/CommonDataType.h"
 
@@ -82,13 +83,15 @@ int main(int argc, char* argv[]) {
         ret = aclProcess.Process(FLAGS_data_path, &costTime_map);
         if (ret != OK) {
             std::cout << "model process failed, errno = " << ret << std::endl;
+            aclProcess.Release();
             return ret;
         }
     } else if (is_dir(FLAGS_data_path)) {
-        struct dirent * filename;
-        DIR * dir;
+        struct dirent *filename;
+        DIR *dir;
         dir = opendir(FLAGS_data_path.c_str());
         if (dir == nullptr) {
+            aclProcess.Release();
             return ERROR;
         }
 
@@ -100,6 +103,7 @@ int main(int argc, char* argv[]) {
             ret = aclProcess.Process(wholePath, &costTime_map);
             if (ret != OK) {
                 std::cout << "model process failed, errno = " << ret << std::endl;
+                aclProcess.Release();
                 return ret;
             }
         }
@@ -109,20 +113,21 @@ int main(int argc, char* argv[]) {
 
     double average = 0.0;
     int infer_cnt = 0;
-    char tmpCh[256];
     for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
         double diff = 0.0;
         diff = iter->second - iter->first;
         average += diff;
         infer_cnt++;
     }
-    average = average/infer_cnt;
-    memset(tmpCh, 0, sizeof(tmpCh));
-    snprintf(tmpCh, sizeof(tmpCh), "NN inference cost average time: %4.3f ms of infer_count %d \n", average, infer_cnt);
+    average = average / infer_cnt;
+
+    std::stringstream timeCost;
+    timeCost << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
     std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
+
     std::string file_name = "./time_Result" + std::string("/test_perform_static.txt");
     std::ofstream file_stream(file_name.c_str(), std::ios::trunc);
-    file_stream << tmpCh;
+    file_stream << timeCost.str();
     file_stream.close();
     costTime_map.clear();
 

model_zoo/official/cv/maskrcnn/ascend310_infer/src/AclProcess.cpp

@@ -142,7 +142,7 @@ int AclProcess::WriteResult(const std::string& imageFile) {
     void *resHostBuf = nullptr;
     for (size_t i = 0; i < outputBuffers_.size(); ++i) {
         size_t output_size;
-        void * netOutput;
+        void *netOutput;
         netOutput = outputBuffers_[i];
         output_size =  outputSizes_[i];
         int ret = aclrtMallocHost(&resHostBuf, output_size);
@@ -164,7 +164,7 @@ int AclProcess::WriteResult(const std::string& imageFile) {
 
         std::string outFileName = homePath + "/" + fileName;
         try {
-            FILE * outputFile = fopen(outFileName.c_str(), "wb");
+            FILE *outputFile = fopen(outFileName.c_str(), "wb");
             if (outputFile == nullptr) {
                 std::cout << "open result file " << outFileName << " failed" << std::endl;
                 return INVALID_POINTER;
@@ -308,7 +308,7 @@ int AclProcess::ModelInfer(std::map<double, double> *costTime_map) {
     }
 
     std::vector<void *> inputBuffers({resizeOutData->data, imInfo_dst});
-    std::vector<size_t> inputSizes({resizeOutData->dataSize, 4*2});
+    std::vector<size_t> inputSizes({resizeOutData->dataSize, 4 * 2});
 
     for (size_t i = 0; i < modelInfo_.outputNum; i++) {
         aclrtMemset(outputBuffers_[i], outputSizes_[i], 0, outputSizes_[i]);

model_zoo/official/cv/maskrcnn/ascend310_infer/src/DvppCommon.cpp

@@ -115,7 +115,7 @@ int DvppCommon::GetVpcDataSize(uint32_t width, uint32_t height, acldvppPixelForm
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetVpcInputStrideSize(uint32_t width, uint32_t height, acldvppPixelFormat format,
-                                            uint32_t *widthStride, uint32_t *heightStride) {
+                                      uint32_t *widthStride, uint32_t *heightStride) {
     uint32_t inputWidthStride;
     if (format >= PIXEL_FORMAT_YUV_400 && format <= PIXEL_FORMAT_YVU_SEMIPLANAR_444) {
         inputWidthStride = DVPP_ALIGN_UP(width, VPC_STRIDE_WIDTH);
@@ -156,7 +156,7 @@ int DvppCommon::GetVpcInputStrideSize(uint32_t width, uint32_t height, acldvppPi
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetVpcOutputStrideSize(uint32_t width, uint32_t height, acldvppPixelFormat format,
-                                             uint32_t *widthStride, uint32_t *heightStride) {
+                                       uint32_t *widthStride, uint32_t *heightStride) {
     if (format != PIXEL_FORMAT_YUV_SEMIPLANAR_420 && format != PIXEL_FORMAT_YVU_SEMIPLANAR_420) {
         std::cout << "Output format[" << format << "] is not supported, just support NV12 or NV21." << std::endl;
         return INVALID_PARAM;
@@ -348,7 +348,7 @@ int DvppCommon::ResizeWithPadding(std::shared_ptr<acldvppPicDesc> inputDesc,
     pasteAreaConfig_.reset(pastRoiCfg, g_roiConfigDeleter);
 
     int ret = acldvppVpcCropAndPasteAsync(dvppChannelDesc_, inputDesc.get(), outputDesc.get(), cropAreaConfig_.get(),
-                                                pasteAreaConfig_.get(), dvppStream_);
+                                          pasteAreaConfig_.get(), dvppStream_);
     if (ret != OK) {
         // release resource.
         std::cout << "Failed to crop and paste asynchronously, ret = " << ret << "." << std::endl;
@@ -574,7 +574,7 @@ void DvppCommon::GetJpegDecodeStrideSize(uint32_t width, uint32_t height,
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetJpegImageInfo(const void *data, uint32_t dataSize, uint32_t *width, uint32_t *height,
-                                       int32_t *components) {
+                                 int32_t *components) {
     uint32_t widthTmp;
     uint32_t heightTmp;
     int32_t componentsTmp;
@@ -608,7 +608,7 @@ int DvppCommon::GetJpegImageInfo(const void *data, uint32_t dataSize, uint32_t *
  * @return: OK if success, other values if failure
  */
 int DvppCommon::GetJpegDecodeDataSize(const void *data, uint32_t dataSize, acldvppPixelFormat format,
-                                            uint32_t *decSize) {
+                                      uint32_t *decSize) {
     uint32_t outputSize;
     int ret = acldvppJpegPredictDecSize(data, dataSize, format, &outputSize);
     if (ret != OK) {
@@ -632,7 +632,7 @@ int DvppCommon::CombineJpegdProcess(const RawData& imageInfo, acldvppPixelFormat
     inputImage_ = std::make_shared<DvppDataInfo>();
     inputImage_->format = format;
     int ret = GetJpegImageInfo(imageInfo.data.get(), imageInfo.lenOfByte, &(inputImage_->width), &(inputImage_->height),
-                                     &components);
+                               &components);
     if (ret != OK) {
         std::cout << "Failed to get input image info, ret = " << ret << "." << std::endl;
         return ret;

model_zoo/official/cv/maskrcnn/ascend310_infer/src/ModelProcess.cpp

@@ -59,7 +59,7 @@ int ModelProcess::ModelInference(const std::vector<void *> &inputBufs,
     if (input == nullptr) {
         return INVALID_POINTER;
     }
-    int ret = 0;
+    int ret;
 
     aclmdlDataset *output = nullptr;
     output = CreateAndFillDataset(ouputBufs, outputSizes);

model_zoo/official/cv/maskrcnn/ascend310_infer/src/main.cpp

@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <cstring>
 #include <fstream>
+#include <sstream>
 #include "../inc/AclProcess.h"
 #include "../inc/CommonDataType.h"
 
@@ -85,8 +86,8 @@ int main(int argc, char* argv[]) {
             return ret;
         }
     } else if (is_dir(FLAGS_data_path)) {
-        struct dirent * filename;
-        DIR * dir;
+        struct dirent *filename;
+        DIR *dir;
         dir = opendir(FLAGS_data_path.c_str());
         if (dir == nullptr) {
             return ERROR;
@@ -109,20 +110,20 @@ int main(int argc, char* argv[]) {
 
     double average = 0.0;
     int infer_cnt = 0;
-    char tmpCh[256];
+
     for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
         double diff = 0.0;
         diff = iter->second - iter->first;
         average += diff;
         infer_cnt++;
     }
-    average = average/infer_cnt;
-    memset(tmpCh, 0, sizeof(tmpCh));
-    snprintf(tmpCh, sizeof(tmpCh), "NN inference cost average time: %4.3f ms of infer_count %d \n", average, infer_cnt);
+    average = average / infer_cnt;
+    std::stringstream timeCost;
+    timeCost << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
     std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
     std::string file_name = "./time_Result" + std::string("/test_perform_static.txt");
     std::ofstream file_stream(file_name.c_str(), std::ios::trunc);
-    file_stream << tmpCh;
+    file_stream << timeCost.str();
     file_stream.close();
     costTime_map.clear();
 

model_zoo/official/cv/resnet/ascend310_infer/src/main.cc

@@ -22,6 +22,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "include/api/model.h"
 #include "include/api/context.h"
@@ -127,7 +128,7 @@ int main(int argc, char **argv) {
   }
   double average = 0.0;
   int inferCount = 0;
-  char tmpCh[256] = {0};
+
   for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
     double diff = 0.0;
     diff = iter->second - iter->first;
@@ -135,12 +136,12 @@ int main(int argc, char **argv) {
     inferCount++;
   }
   average = average / inferCount;
-  snprintf(tmpCh, sizeof(tmpCh), \
-  "NN inference cost average time: %4.3f ms of infer_count %d \n", average, inferCount);
+  std::stringstream timeCost;
+  timeCost << "NN inference cost average time: "<< average << "ms of infer_count " << inferCount << std::endl;
   std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << inferCount << std::endl;
   std::string fileName = "./time_Result" + std::string("/test_perform_static.txt");
   std::ofstream fileStream(fileName.c_str(), std::ios::trunc);
-  fileStream << tmpCh;
+  fileStream << timeCost.str();
   fileStream.close();
   costTime_map.clear();
   return 0;

model_zoo/official/cv/ssd/ascend310_infer/src/main.cc

@@ -22,6 +22,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "include/api/model.h"
 #include "include/api/context.h"
@@ -144,7 +145,7 @@ int main(int argc, char **argv) {
   }
   double average = 0.0;
   int inferCount = 0;
-  char tmpCh[256] = {0};
+
   for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
     double diff = 0.0;
     diff = iter->second - iter->first;
@@ -152,12 +153,12 @@ int main(int argc, char **argv) {
     inferCount++;
   }
   average = average / inferCount;
-  snprintf(tmpCh, sizeof(tmpCh), \
-  "NN inference cost average time: %4.3f ms of infer_count %d \n", average, inferCount);
+  std::stringstream timeCost;
+  timeCost << "NN inference cost average time: "<< average << "ms of infer_count " << inferCount << std::endl;
   std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << inferCount << std::endl;
   std::string fileName = "./time_Result" + std::string("/test_perform_static.txt");
   std::ofstream fileStream(fileName.c_str(), std::ios::trunc);
-  fileStream << tmpCh;
+  fileStream << timeCost.str();
   fileStream.close();
   costTime_map.clear();
   return 0;

model_zoo/official/cv/unet/ascend310_infer/src/main.cc

@@ -23,6 +23,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "include/api/model.h"
 #include "include/api/serialization.h"
@@ -128,7 +129,7 @@ int main(int argc, char **argv) {
   }
   double average = 0.0;
   int infer_cnt = 0;
-  char tmpCh[256] = {0};
+
   for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
     double diff = 0.0;
     diff = iter->second - iter->first;
@@ -136,11 +137,12 @@ int main(int argc, char **argv) {
     infer_cnt++;
   }
   average = average/infer_cnt;
-  snprintf(tmpCh, sizeof(tmpCh), "NN inference cost average time: %4.3f ms of infer_count %d \n", average, infer_cnt);
+  std::stringstream timeCost;
+  timeCost << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
   std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
   std::string file_name = "./time_Result" + std::string("/test_perform_static.txt");
   std::ofstream file_stream(file_name.c_str(), std::ios::trunc);
-  file_stream << tmpCh;
+  file_stream << timeCost.str();
   file_stream.close();
   costTime_map.clear();
   return 0;

model_zoo/official/cv/yolov4/ascend310_infer/src/main.cc

@@ -23,6 +23,7 @@
 #include <iosfwd>
 #include <vector>
 #include <fstream>
+#include <sstream>
 
 #include "include/api/model.h"
 #include "include/api/serialization.h"
@@ -133,7 +134,7 @@ int main(int argc, char **argv) {
   }
   double average = 0.0;
   int infer_cnt = 0;
-  char tmpCh[256] = {0};
+
   for (auto iter = costTime_map.begin(); iter != costTime_map.end(); iter++) {
     double diff = 0.0;
     diff = iter->second - iter->first;
@@ -141,11 +142,12 @@ int main(int argc, char **argv) {
     infer_cnt++;
   }
   average = average/infer_cnt;
-  snprintf(tmpCh, sizeof(tmpCh), "NN inference cost average time: %4.3f ms of infer_count %d \n", average, infer_cnt);
+  std::stringstream timeCost;
+  timeCost << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
   std::cout << "NN inference cost average time: "<< average << "ms of infer_count " << infer_cnt << std::endl;
   std::string file_name = "./time_Result" + std::string("/test_perform_static.txt");
   std::ofstream file_stream(file_name.c_str(), std::ios::trunc);
-  file_stream << tmpCh;
+  file_stream << timeCost.str();
   file_stream.close();
   costTime_map.clear();
   return 0;

model_zoo/official/recommend/naml/ascend310_infer/inc/model_process.h

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#ifndef MINDSPORE_MODEL_ZOO_NAML_MODEL_PROCESS_H_
+#define MINDSPORE_MODEL_ZOO_NAML_MODEL_PROCESS_H_
 #pragma once
 #include <iostream>
 #include <map>
@@ -45,13 +47,11 @@ class ModelProcess {
 
     Result Execute(uint32_t index);
 
-    void DumpModelOutputResult(std::string fileName);
-
     void OutputModelResult();
     Result CreateInput();
     Result CpyFileToDevice(std::string fileName, uint32_t inputNum);
-    void CpyOutputFromDeviceToHost(uint32_t index, uint32_t batchSize);
-    std::map<int, void*> GetResult();
+    void CpyOutputFromDeviceToHost(uint32_t index);
+    std::map<int, void *> GetResult();
     std::vector<uint32_t> GetOutputSize();
     std::vector<uint32_t> GetInputSize();
     Result ExecuteWithFile(uint32_t fileNum);
@@ -82,9 +82,9 @@ class ModelProcess {
     uint32_t outputNum_;
     std::vector<uint32_t> outputBuffSize_;
 
-    std::map<int, void*> result_;
-    std::vector<void*> resultMem_;
-    std::vector<void*> fileBuffMem_;
+    std::map<int, void *> result_;
+    std::vector<void *> resultMem_;
+    std::vector<void *> fileBuffMem_;
     std::string inputDataPath_;
     std::string idFilePath_;
     std::vector<std::vector<void *>> fileBuff_;
@@ -92,3 +92,4 @@ class ModelProcess {
     std::vector<std::vector<int>> ids_;
 };
 
+#endif

model_zoo/official/recommend/naml/ascend310_infer/inc/sample_process.h

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef MINDSPORE_MODEL_ZOO_NAML_SAMPLE_PROCESS_H_
+#define MINDSPORE_MODEL_ZOO_NAML_SAMPLE_PROCESS_H_
+
 #pragma once
 #include <map>
 #include <memory>
@@ -49,8 +52,8 @@ class SampleProcess {
                            std::vector<std::vector<int>> *usersIds, std::vector<std::vector<int>> *candidateNewsIds);
     uint32_t ReadBrowsedData(const std::string &browsedNewsPath);
     void GetResult(uint32_t startPos, uint32_t endPos,
-                                  std::map<int, void*> newsEncodeResult,
-                                  std::map<int, void*> userEncodeResult);
+                                  std::map<int, void *> newsEncodeResult,
+                                  std::map<int, void *> userEncodeResult);
 
  private:
     void DestroyResource();
@@ -69,3 +72,4 @@ class SampleProcess {
     std::mutex mtx_;
 };
 
+#endif

model_zoo/official/recommend/naml/ascend310_infer/inc/utils.h

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef MINDSPORE_MODEL_ZOO_NAML_UTILS_H_
+#define MINDSPORE_MODEL_ZOO_NAML_UTILS_H_
+
 #pragma once
 #include <dirent.h>
 #include <iostream>
@@ -49,3 +52,5 @@ class Utils {
                                    std::vector<std::vector<int>> *newsId);
 };
 #pragma once
+
+#endif

model_zoo/official/recommend/naml/ascend310_infer/src/model_process.cpp

@@ -26,11 +26,20 @@
 extern bool g_isDevice;
 
 ModelProcess::ModelProcess(const std::string &inputDataPath, const std::string &idFilePath, uint32_t batchSize):
-                           modelId_(0), modelMemSize_(0), modelWeightSize_(0), modelMemPtr_(nullptr),
-                           modelWeightPtr_(nullptr), loadFlag_(false), modelDesc_(nullptr), output_(nullptr),
-                           inputDataPath_(inputDataPath), input_(nullptr), batchSize_(batchSize),
-                           idFilePath_(idFilePath), inputNum_(0), outputNum_(0) {
-}
+    modelId_(0),
+    modelMemSize_(0),
+    modelWeightSize_(0),
+    modelMemPtr_(nullptr),
+    modelWeightPtr_(nullptr),
+    loadFlag_(false),
+    modelDesc_(nullptr),
+    output_(nullptr),
+    inputDataPath_(inputDataPath),
+    input_(nullptr),
+    batchSize_(batchSize),
+    idFilePath_(idFilePath),
+    inputNum_(0),
+    outputNum_(0) {}
 
 ModelProcess::~ModelProcess() {
     Unload();
@@ -244,62 +253,6 @@ Result ModelProcess::CreateOutput() {
     return SUCCESS;
 }
 
-void ModelProcess::DumpModelOutputResult(std::string fileName) {
-    std::size_t dex = fileName.find_last_of(".");
-    std::string outputFile = fileName.erase(dex);
-    std::string Path = "../result_Files";
-
-    // stringstream ss;
-    size_t outputNum = aclmdlGetDatasetNumBuffers(output_);
-    static int executeNum = 0;
-    for (size_t i = 0; i < outputNum; ++i) {
-        std::stringstream ss;
-        ss << Path <<"/output" << "_" << i << "_in_" << outputFile << ".bin";
-        std::string outputFileName = ss.str();
-        FILE *file = fopen(outputFileName.c_str(), "wb");
-        if (file) {
-            aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i);
-            void* data = aclGetDataBufferAddr(dataBuffer);
-            uint32_t len = aclGetDataBufferSizeV2(dataBuffer);
-
-            void* outHostData = NULL;
-            aclError ret = ACL_ERROR_NONE;
-            if (!g_isDevice) {
-                ret = aclrtMallocHost(&outHostData, len);
-                if (ret != ACL_ERROR_NONE) {
-                    ERROR_LOG("aclrtMallocHost failed, ret[%d]", ret);
-                    return;
-                }
-
-                ret = aclrtMemcpy(outHostData, len, data, len, ACL_MEMCPY_DEVICE_TO_HOST);
-                if (ret != ACL_ERROR_NONE) {
-                    ERROR_LOG("aclrtMemcpy failed, ret[%d]", ret);
-                    (void)aclrtFreeHost(outHostData);
-                    return;
-                }
-
-                fwrite(outHostData, len, sizeof(char), file);
-
-                ret = aclrtFreeHost(outHostData);
-                if (ret != ACL_ERROR_NONE) {
-                    ERROR_LOG("aclrtFreeHost failed, ret[%d]", ret);
-                    return;
-                }
-            } else {
-                fwrite(data, len, sizeof(char), file);
-            }
-            fclose(file);
-            file = nullptr;
-        } else {
-            ERROR_LOG("create output file [%s] failed", outputFileName.c_str());
-            return;
-        }
-    }
-
-    INFO_LOG("dump data success");
-    return;
-}
-
 void ModelProcess::OutputModelResult() {
     for (size_t i = 0; i < aclmdlGetDatasetNumBuffers(output_); ++i) {
         aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i);
@@ -322,9 +275,9 @@ void ModelProcess::OutputModelResult() {
                 return;
             }
 
-            outData = reinterpret_cast<float*>(outHostData);
+            outData = reinterpret_cast<float *>(outHostData);
         } else {
-            outData = reinterpret_cast<float*>(data);
+            outData = reinterpret_cast<float *>(data);
         }
         std::map<float, unsigned int, std::greater<float> > resultMap;
         for (unsigned int j = 0; j < len / sizeof(float); ++j) {
@@ -372,12 +325,12 @@ void ModelProcess::DestroyOutput() {
 
 Result ModelProcess::CpyFileToDevice(std::string fileName, uint32_t inputNum) {
     uint32_t inputHostBuffSize = 0;
-    void* inputHostBuff = Utils::ReadBinFile(fileName, &inputHostBuffSize);
+    void *inputHostBuff = Utils::ReadBinFile(fileName, &inputHostBuffSize);
     if (inputHostBuff == nullptr) {
         return FAILED;
     }
     aclDataBuffer *inBufferDev = aclmdlGetDatasetBuffer(input_, inputNum);
-    void*p_batchDst = aclGetDataBufferAddr(inBufferDev);
+    void *p_batchDst = aclGetDataBufferAddr(inBufferDev);
     aclrtMemset(p_batchDst, inputHostBuffSize, 0, inputHostBuffSize);
     aclError ret = aclrtMemcpy(p_batchDst, inputHostBuffSize, inputHostBuff, inputHostBuffSize,
                                ACL_MEMCPY_HOST_TO_DEVICE);
@@ -396,7 +349,7 @@ Result ModelProcess::CpyDataToDevice(void *data, uint32_t len, uint32_t inputNum
         return FAILED;
     }
     aclDataBuffer *inBufferDev = aclmdlGetDatasetBuffer(input_, inputNum);
-    void*p_batchDst = aclGetDataBufferAddr(inBufferDev);
+    void *p_batchDst = aclGetDataBufferAddr(inBufferDev);
     aclrtMemset(p_batchDst, len, 0, len);
     aclError ret = aclrtMemcpy(p_batchDst, len, data, len, ACL_MEMCPY_HOST_TO_DEVICE);
     if (ret != ACL_ERROR_NONE) {
@@ -407,7 +360,7 @@ Result ModelProcess::CpyDataToDevice(void *data, uint32_t len, uint32_t inputNum
     return SUCCESS;
 }
 
-void ModelProcess::CpyOutputFromDeviceToHost(uint32_t index, uint32_t batchSize) {
+void ModelProcess::CpyOutputFromDeviceToHost(uint32_t index) {
     size_t outputNum = aclmdlGetDatasetNumBuffers(output_);
 
     for (size_t i = 0; i < outputNum; ++i) {
@@ -430,8 +383,8 @@ void ModelProcess::CpyOutputFromDeviceToHost(uint32_t index, uint32_t batchSize)
             return;
         }
 
-        uint32_t len = (uint32_t)bufferSize/batchSize;
-        for (size_t j = 0; j < batchSize; j++) {
+        uint32_t len = (uint32_t)bufferSize / batchSize_;
+        for (size_t j = 0; j < batchSize_; j++) {
             result_.emplace(ids_[index][j], reinterpret_cast<uint8_t *>(outHostData) + (j * len));
         }
     }
@@ -448,7 +401,7 @@ std::vector<std::vector<void *>> ModelProcess::ReadInputFiles(std::vector<std::v
         return buff;
     }
 
-    void* inputHostBuff;
+    void *inputHostBuff = nullptr;
     uint32_t inputHostBuffSize = 0;
     for (int i = 0; i < inputSize; ++i) {
         for (int j = 0; j < fileNum; ++j) {
@@ -491,8 +444,8 @@ Result ModelProcess::ExecuteWithFile(uint32_t fileNum) {
         double startTime_ms;
         double endTime_ms;
         gettimeofday(&start, NULL);
-        void* picDevBuffer = nullptr;
-        int pathIndex = 0;
+        void *picDevBuffer = nullptr;
+
         for (auto i = 0; i < inputNum_; ++i) {
             CpyDataToDevice(fileBuff_[i][index], fileSize_[i][index], i);
         }
@@ -503,7 +456,7 @@ Result ModelProcess::ExecuteWithFile(uint32_t fileNum) {
             return FAILED;
         }
 
-        CpyOutputFromDeviceToHost(index, batchSize_);
+        CpyOutputFromDeviceToHost(index);
         gettimeofday(&end, NULL);
         startTime_ms = (1.0 * start.tv_sec * 1000000 + start.tv_usec) / 1000;
         endTime_ms = (1.0 * end.tv_sec * 1000000 + end.tv_usec) / 1000;
@@ -525,7 +478,7 @@ Result ModelProcess::Execute(uint32_t index) {
         return FAILED;
     }
 
-    CpyOutputFromDeviceToHost(index, batchSize_);
+    CpyOutputFromDeviceToHost(index);
     gettimeofday(&end, NULL);
     startTime_ms = (1.0 * start.tv_sec * 1000000 + start.tv_usec) / 1000;
     endTime_ms = (1.0 * end.tv_sec * 1000000 + end.tv_usec) / 1000;
@@ -533,7 +486,7 @@ Result ModelProcess::Execute(uint32_t index) {
     return SUCCESS;
 }
 
-std::map<int, void*> ModelProcess::GetResult() {
+std::map<int, void *> ModelProcess::GetResult() {
     return result_;
 }
 
@@ -584,15 +537,17 @@ std::string ModelProcess::GetInputDataPath() {
 std::string ModelProcess::GetCostTimeInfo() {
     double average = 0.0;
     int infer_cnt = 0;
-    char tmpCh[256] = {0};
+
     for (auto iter = costTime_map_.begin(); iter != costTime_map_.end(); iter++) {
         double diff = 0.0;
         diff = iter->second - iter->first;
         average += diff;
         infer_cnt++;
     }
-    average = average/infer_cnt;
-    snprintf(tmpCh, sizeof(tmpCh), "first model latency %4.3f ms; count %d\n", average, infer_cnt);
+    average = average / infer_cnt;
+
+    std::stringstream timeCost;
+    timeCost << "first model latency "<< average << "ms; count " << infer_cnt << std::endl;
 
-    return std::string(tmpCh);
+    return timeCost.str();
 }

model_zoo/official/recommend/naml/ascend310_infer/src/sample_process.cpp

@@ -25,6 +25,7 @@
 #include <unordered_map>
 #include <iterator>
 #include <thread>
+#include <sstream>
 
 #include "acl/acl.h"
 #include "../inc/utils.h"
@@ -36,7 +37,10 @@ extern bool g_isDevice;
 SampleProcess::SampleProcess() :deviceId_(0), context_(nullptr), stream_(nullptr), threadNum_(0) {}
 
 SampleProcess::SampleProcess(uint32_t deviceId, uint32_t threadNum):
-                             deviceId_(deviceId), threadNum_(threadNum), context_(nullptr), stream_(nullptr) {}
+    deviceId_(deviceId),
+    threadNum_(threadNum),
+    context_(nullptr),
+    stream_(nullptr) {}
 
 SampleProcess::~SampleProcess() {
     DestroyResource();
@@ -145,7 +149,7 @@ Result SampleProcess::Process(const std::vector<std::string> &omPaths,
     gettimeofday(&totalStart, NULL);
     modelProcessContainer_[0]->ExecuteWithFile(fileNum);
 
-    std::map<int, void*> result = modelProcessContainer_[0]->GetResult();
+    std::map<int, void *> result = modelProcessContainer_[0]->GetResult();
 
     std::vector<uint32_t> model1OutputBuffSize = modelProcessContainer_[0]->GetOutputSize();
     std::vector<uint32_t> inputBuffSize = modelProcessContainer_[1]->GetInputSize();
@@ -164,7 +168,7 @@ Result SampleProcess::Process(const std::vector<std::string> &omPaths,
             for (int k = 0; k < 50; ++k) {
                 auto it = result.find(allHistory[i][j][k]);
                 if (it != result.end()) {
-                    aclrtMemcpy(reinterpret_cast<uint8_t *>(browedNews) + (j*50 + k) * singleDatsSize, singleDatsSize,
+                    aclrtMemcpy(reinterpret_cast<uint8_t *>(browedNews) + (j * 50 + k) * singleDatsSize, singleDatsSize,
                                 result[allHistory[i][j][k]], singleDatsSize, ACL_MEMCPY_HOST_TO_HOST);
                 }
             }
@@ -218,8 +222,8 @@ uint32_t SampleProcess::ReadBrowsedData(const std::string &browsedNewsPath) {
 }
 
 Result SampleProcess::GetPred(uint32_t fileNum) {
-    std::map<int, void*> newsEncodeResult = modelProcessContainer_[0]->GetResult();
-    std::map<int, void*> userEncodeResult = modelProcessContainer_[1]->GetResult();
+    std::map<int, void *> newsEncodeResult = modelProcessContainer_[0]->GetResult();
+    std::map<int, void *> userEncodeResult = modelProcessContainer_[1]->GetResult();
 
     uint32_t perThreadNum = fileNum / threadNum_;
     std::vector<std::thread> threads;
@@ -227,7 +231,7 @@ Result SampleProcess::GetPred(uint32_t fileNum) {
     for (int i = 0; i < threadNum_; ++i) {
         if (i != threadNum_ - 1) {
             threads.emplace_back(std::thread(&SampleProcess::GetResult, this,
-                                             i * perThreadNum, (i+1) * perThreadNum,
+                                             i * perThreadNum, (i + 1) * perThreadNum,
                                              newsEncodeResult,
                                              userEncodeResult));
         } else {
@@ -245,8 +249,8 @@ Result SampleProcess::GetPred(uint32_t fileNum) {
     return SUCCESS;
 }
 void SampleProcess::GetResult(uint32_t startPos, uint32_t endPos,
-                              std::map<int, void*> newsEncodeResult,
-                              std::map<int, void*> userEncodeResult) {
+                              std::map<int, void *> newsEncodeResult,
+                              std::map<int, void *> userEncodeResult) {
     for (int i = startPos; i < endPos; ++i) {
         std::vector<std::vector<float>> newsCandidate;
         std::vector<float> userEncodeIds(400);
@@ -282,13 +286,13 @@ int SampleProcess::WriteResult(const std::string& imageFile, std::vector<float>
     for (size_t i = 0; i < 1; ++i) {
         std::string outFileName = homePath + "/" + name;
         try {
-            FILE * outputFile = fopen(outFileName.c_str(), "wb");
-            fwrite(static_cast<void*>(&result[0]), size, sizeof(char), outputFile);
+            FILE *outputFile = fopen(outFileName.c_str(), "wb");
+            fwrite(static_cast<void *>(&result[0]), size, sizeof(char), outputFile);
             fclose(outputFile);
             outputFile = nullptr;
         } catch (std::exception &e) {
             std::cout << "write result file " << outFileName << " failed, error info: " << e.what() << std::endl;
-            std::exit(1);
+            return FAILED;
         }
     }
     return SUCCESS;
@@ -333,7 +337,7 @@ std::vector<std::string> SampleProcess::GetModelExecCostTimeInfo() {
     result.emplace_back(modelProcessContainer_[0]->GetCostTimeInfo());
     double secondModelAverage = 0.0;
     int infer_cnt = 0;
-    char tmpCh[256] = {0};
+
     for (auto iter = secondModelCostTime_map_.begin(); iter != secondModelCostTime_map_.end(); iter++) {
         double diff = 0.0;
         diff = iter->second - iter->first;
@@ -341,14 +345,16 @@ std::vector<std::string> SampleProcess::GetModelExecCostTimeInfo() {
         infer_cnt++;
     }
     secondModelAverage = secondModelAverage / infer_cnt;
-    snprintf(tmpCh, sizeof(tmpCh), "second model inference cost average time: %4.3f ms of infer_count %d\n",
-             secondModelAverage, infer_cnt);
-    result.emplace_back(tmpCh);
+    std::stringstream timeCost;
+    timeCost << "second model inference cost average time: "<< secondModelAverage <<
+        "ms of infer_count " << infer_cnt << std::endl;
+    result.emplace_back(timeCost.str());
 
     double totalCostTime;
     totalCostTime = totalCostTime_map_.begin()->second - totalCostTime_map_.begin()->first;
-    snprintf(tmpCh, sizeof(tmpCh), "total inference cost time: %4.3f ms; count %d\n", totalCostTime, infer_cnt);
-    result.emplace_back(tmpCh);
+    std::stringstream totalTimeCost;
+    totalTimeCost << "total inference cost time: "<< totalCostTime << " ms; count " << infer_cnt << std::endl;
+    result.emplace_back(totalTimeCost.str());
 
     return result;
 }

model_zoo/official/recommend/naml/ascend310_infer/src/utils.cpp

@@ -171,7 +171,6 @@ std::string Utils::RealPath(std::string path) {
     char real_path_mem[PATH_MAX] = {0};
     char *real_path_ret = nullptr;
     real_path_ret = realpath(path.data(), real_path_mem);
-
     if (real_path_ret == nullptr) {
         std::cout << "File: " << path << " is not exist.";
         return "";