From 454f290c5d510029841809bfae0f1f2b258195f6 Mon Sep 17 00:00:00 2001 From: chenzhuo Date: Fri, 27 Aug 2021 09:53:50 +0800 Subject: [PATCH] fix post quant cpp format --- .../cv/crnn/ascend310_quant_infer/src/model_process.cpp | 2 +- .../cv/crnn/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../deeplabv3/ascend310_quant_infer/src/model_process.cpp | 2 +- .../deeplabv3/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../cv/maskrcnn/ascend310_quant_infer/src/model_process.cpp | 2 +- .../maskrcnn/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../cv/ssd/ascend310_quant_infer/src/model_process.cpp | 2 +- .../cv/ssd/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../cv/unet/ascend310_quant_infer/src/model_process.cpp | 2 +- .../cv/unet/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../cv/vgg16/ascend310_quant_infer/src/model_process.cpp | 2 +- .../cv/vgg16/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../cv/yolov3_darknet53/ascend310_quant_infer/post_quant.py | 5 +++-- .../ascend310_quant_infer/src/model_process.cpp | 2 +- .../ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../ascend310_quant_infer/src/model_process.cpp | 2 +- .../ascend310_quant_infer/src/sample_process.cpp | 6 +++--- .../cv/yolov4/ascend310_quant_infer/src/model_process.cpp | 2 +- .../cv/yolov4/ascend310_quant_infer/src/sample_process.cpp | 6 +++--- 19 files changed, 39 insertions(+), 38 deletions(-) diff --git a/model_zoo/official/cv/crnn/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/crnn/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/crnn/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/crnn/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/crnn/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/crnn/ascend310_quant_infer/src/sample_process.cpp index 07b87592d57..5f8f20f297b 100644 --- a/model_zoo/official/cv/crnn/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/crnn/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/sample_process.cpp index 07b87592d57..5f8f20f297b 100644 --- a/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/model_process.cpp index bc12f3fac13..59f2f7a2509 100644 --- a/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/sample_process.cpp index e84a0becffc..10e36d747d7 100644 --- a/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder, char *shape_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/ssd/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/ssd/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/ssd/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/ssd/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/ssd/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/ssd/ascend310_quant_infer/src/sample_process.cpp index 6d0dc6cc6af..cbf58dbae68 100644 --- a/model_zoo/official/cv/ssd/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/ssd/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/unet/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/unet/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/unet/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/unet/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/unet/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/unet/ascend310_quant_infer/src/sample_process.cpp index 07b87592d57..5f8f20f297b 100644 --- a/model_zoo/official/cv/unet/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/unet/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/sample_process.cpp index 6d0dc6cc6af..cbf58dbae68 100644 --- a/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/vgg16/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/post_quant.py b/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/post_quant.py index 09ca77a8da8..89adccb605c 100644 --- a/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/post_quant.py +++ b/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/post_quant.py @@ -66,12 +66,13 @@ if __name__ == "__main__": load_param_into_net(net, param_dict) net.set_train(False) - config.batch_size = 1 + config.batch_size = 16 data_path = os.path.join(config.data_dir, "val2014") datasets, data_size = create_yolo_dataset(data_path, config.annFile, is_training=False, batch_size=config.batch_size, max_epoch=1, device_num=1, rank=0, shuffle=False, config=config) ds = datasets.take(1) - shape = [config.batch_size, 3] + config.test_img_shape + export_batch_size = 1 + shape = [export_batch_size, 3] + config.test_img_shape inputs = Tensor(np.zeros(shape), ms.float32) quant_yolov3(net, ds, inputs) diff --git a/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/sample_process.cpp index 07b87592d57..5f8f20f297b 100644 --- a/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/model_process.cpp index bc12f3fac13..59f2f7a2509 100644 --- a/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/sample_process.cpp index e84a0becffc..10e36d747d7 100644 --- a/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder, char *shape_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0}; diff --git a/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/model_process.cpp b/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/model_process.cpp index 913c5989f4b..04e6a42ab43 100644 --- a/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/model_process.cpp +++ b/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/model_process.cpp @@ -182,7 +182,7 @@ void ModelProcess::DumpModelOutputResult(char *output_name) { ss << "result/" << output_name << "_output_" << i << ".bin"; std::string outputFileName = ss.str(); FILE *outputFile = fopen(outputFileName.c_str(), "wb"); - if (outputFile) { + if (outputFile != nullptr) { aclDataBuffer* dataBuffer = aclmdlGetDatasetBuffer(output_, i); void* data = aclGetDataBufferAddr(dataBuffer); uint32_t len = aclGetDataBufferSizeV2(dataBuffer); diff --git a/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/sample_process.cpp b/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/sample_process.cpp index 07b87592d57..5f8f20f297b 100644 --- a/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/sample_process.cpp +++ b/model_zoo/official/cv/yolov4/ascend310_quant_infer/src/sample_process.cpp @@ -84,7 +84,7 @@ Result SampleProcess::InitResource() { void SampleProcess::GetAllFiles(std::string path, std::vector *files) { DIR *pDir = NULL; - struct dirent* ptr; + struct dirent* ptr = nullptr; if (!(pDir = opendir(path.c_str()))) { return; } @@ -98,8 +98,8 @@ void SampleProcess::GetAllFiles(std::string path, std::vector *files) { Result SampleProcess::Process(char *om_path, char *input_folder) { // model init - double second_to_millisecond = 1000; - double second_to_microsecond = 1000000; + const double second_to_millisecond = 1000; + const double second_to_microsecond = 1000000; double whole_cost_time = 0.0; struct timeval start_global = {0};