Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!22455 [bug][Ascend] Fix post training quantization code format 

Merge pull request !22455 from chenzhuo/master
This commit is contained in:
i-robot 2021-08-28 08:21:14 +00:00 committed by Gitee
parent be009760cd 454f290c5d
commit c0851e2e68
19 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model_zoo/official/cv/crnn/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/crnn/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/deeplabv3/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/maskrcnn/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/ssd/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/ssd/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/unet/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/unet/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/vgg16/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/vgg16/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

5
model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/post_quant.py
View File

@ -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)

2
model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/yolov3_darknet53/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/yolov3_resnet18/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};

2
model_zoo/official/cv/yolov4/ascend310_quant_infer/src/model_process.cpp
View File

@ -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);

6
model_zoo/official/cv/yolov4/ascend310_quant_infer/src/sample_process.cpp
View File

@ -84,7 +84,7 @@ Result SampleProcess::InitResource() {
void SampleProcess::GetAllFiles(std::string path, std::vector<string> *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<string> *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};