Pre Merge pull request !556 from dajunli/development

ge/common/base64.h

@@ -25,9 +25,10 @@
 
 namespace ge {
 namespace {
-const char* kBase64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                           "abcdefghijklmnopqrstuvwxyz"
-                           "0123456789+/";
+const std::string kBase64Chars = 
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "abcdefghijklmnopqrstuvwxyz"
+    "0123456789+/";
 const char kEqualSymbol = '=';
 const size_t kBase64CharsNum = 64;
 const size_t kThreeByteOneGroup = 3;
@@ -88,8 +89,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<uint8_t>(std::distance(kBase64Chars, char_pos)) & 0xff;
+    auto char_pos = std::find(kBase64Chars.begin(), kBase64Chars.end(), raw_char);
+    return static_cast<uint8_t>(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) {

ge/common/dump/dump_op.cc

@@ -178,9 +178,6 @@ Status DumpOp::ExecutorDumpOp(aicpu::dump::OpMappingInfo &op_mapping_info) {
   auto param_head = reinterpret_cast<aicpu::AicpuParamHead *>(args);
   param_head->length = args_size;
   param_head->ioAddrNum = io_addr_num;
-  auto io_addr = reinterpret_cast<uint64_t *>(args + sizeof(aicpu::AicpuParamHead));
-  io_addr[0] = reinterpret_cast<uintptr_t>(proto_dev_mem_);
-  io_addr[1] = reinterpret_cast<uintptr_t>(proto_size_dev_mem_);
   rt_ret = rtCpuKernelLaunch(nullptr, kDumpKernelsDumpOp,
                              1,  // blockDim default 1
                              args, args_size,

metadef

@@ -1 +1 @@
-Subproject commit 5b9a7f84a4347f8816d492aa51f2414ccf8a0744
+Subproject commit 31a89522398f697410087724885fc7f74d9e7117

parser

@@ -1 +1 @@
-Subproject commit 70369668abebed84942d9f355494a89e82cc1eac
+Subproject commit 9e392045c26a57913b512d0686e1285650b62abe