From 6b978cfb6f2030f6a46b0a015ce7cf0ae0e5f8af Mon Sep 17 00:00:00 2001 From: dajunli Date: Tue, 8 Dec 2020 17:37:13 +0800 Subject: [PATCH 1/2] change some warning code --- ge/common/base64.h | 10 +++++----- ge/common/dump/dump_op.cc | 3 --- metadef | 2 +- parser | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ge/common/base64.h b/ge/common/base64.h index fb6c1870..bc1476ab 100644 --- a/ge/common/base64.h +++ b/ge/common/base64.h @@ -25,9 +25,9 @@ namespace ge { namespace { -const char* kBase64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789+/"; +const string kBase64Chars("ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"); const char kEqualSymbol = '='; const size_t kBase64CharsNum = 64; const size_t kThreeByteOneGroup = 3; @@ -88,8 +88,8 @@ static Status DecodeFromBase64(const std::string &base64_data, std::string &deco size_t base64_data_len = base64_data.size(); uint8_t byte_4[kFourByteOneGroup]; auto FindCharInBase64Chars = [&](const char &raw_char) -> uint8_t { - auto char_pos = std::find(kBase64Chars, kBase64Chars + kBase64CharsNum, raw_char); - return static_cast(std::distance(kBase64Chars, char_pos)) & 0xff; + auto char_pos = std::find(kBase64Chars.begin(), kBase64Chars.end(), raw_char); + return static_cast(std::distance(kBase64Chars.begin(), char_pos)) & 0xff; }; for (std::size_t input_data_index = 0; input_data_index < base64_data_len; input_data_index += 4) { diff --git a/ge/common/dump/dump_op.cc b/ge/common/dump/dump_op.cc index e92ada05..0e3fc3e2 100755 --- a/ge/common/dump/dump_op.cc +++ b/ge/common/dump/dump_op.cc @@ -178,9 +178,6 @@ Status DumpOp::ExecutorDumpOp(aicpu::dump::OpMappingInfo &op_mapping_info) { auto param_head = reinterpret_cast(args); param_head->length = args_size; param_head->ioAddrNum = io_addr_num; - auto io_addr = reinterpret_cast(args + sizeof(aicpu::AicpuParamHead)); - io_addr[0] = reinterpret_cast(proto_dev_mem_); - io_addr[1] = reinterpret_cast(proto_size_dev_mem_); rt_ret = rtCpuKernelLaunch(nullptr, kDumpKernelsDumpOp, 1, // blockDim default 1 args, args_size, diff --git a/metadef b/metadef index 5b9a7f84..31a89522 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 5b9a7f84a4347f8816d492aa51f2414ccf8a0744 +Subproject commit 31a89522398f697410087724885fc7f74d9e7117 diff --git a/parser b/parser index 70369668..9e392045 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 70369668abebed84942d9f355494a89e82cc1eac +Subproject commit 9e392045c26a57913b512d0686e1285650b62abe From 7616370cdf143b9d5672f38aa26c4a66d6a096a5 Mon Sep 17 00:00:00 2001 From: dajunli Date: Wed, 9 Dec 2020 10:29:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ge/common/base64.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ge/common/base64.h b/ge/common/base64.h index bc1476ab..59661569 100644 --- a/ge/common/base64.h +++ b/ge/common/base64.h @@ -25,9 +25,10 @@ namespace ge { namespace { -const string kBase64Chars("ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789+/"); +const std::string kBase64Chars = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; const char kEqualSymbol = '='; const size_t kBase64CharsNum = 64; const size_t kThreeByteOneGroup = 3;