Change charcases char_cases (#62310)

co63oc · web-flow · commit f0eabc4c46fb · 2024-03-04T12:21:35.000+08:00
* Fix

* Fix
diff --git a/paddle/phi/kernels/strings/gpu/strings_lower_upper_kernel.cu b/paddle/phi/kernels/strings/gpu/strings_lower_upper_kernel.cu
@@ -56,7 +56,7 @@ struct UTF8CaseConverter<phi::GPUContext, CharConverter> {
                   pstring* out,
                   size_t num) const {
     auto unicode_flag_map = GetGPUUniflagMap();
-    auto cases_map = GetGPUCharcasesMap();
+    auto cases_map = GetGPUCharCasesMap();
     thrust::device_vector<uint32_t> unicode_offsets(num + 1, 0);
     uint32_t* unicode_offsets_ptr =
         thrust::raw_pointer_cast(unicode_offsets.data());
diff --git a/paddle/phi/kernels/strings/strings_lower_upper_kernel.h b/paddle/phi/kernels/strings/strings_lower_upper_kernel.h
@@ -60,13 +60,13 @@ StringTensor StringUpper(const ContextT& dev_ctx,
   return string_out;
 }
 
-template <typename AsciiCoverter, typename UTF8Converter, typename ContextT>
+template <typename AsciiConverter, typename UTF8Converter, typename ContextT>
 struct StringCaseConvertKernel {
   void operator()(const ContextT& dev_ctx,
                   const StringTensor& x,
                   bool use_utf8_encoding,
                   StringTensor* out) {
-    AsciiCoverter ascii_converter;
+    AsciiConverter ascii_converter;
     UTF8Converter utf8_converter;
     const pstring* in_ptr = x.data();
     pstring* out_ptr = dev_ctx.template Alloc<pstring>(out);
@@ -101,7 +101,7 @@ struct UTF8CaseConverter {
                   pstring* out,
                   size_t num) const {
     auto unicode_flag_map = GetUniFlagMap();
-    auto cases_map = GetCharcasesMap();
+    auto cases_map = GetCharCasesMap();
     for (size_t i = 0; i < num; ++i) {
       uint32_t unicode_len = GetUnicodeStrLen(in[i].data(), in[i].size());
       std::vector<uint32_t> unicode_in(unicode_len, 0);
diff --git a/paddle/phi/kernels/strings/unicode.cc b/paddle/phi/kernels/strings/unicode.cc
@@ -23,7 +23,7 @@ namespace phi {
 namespace strings {
 
 static const void* utils_map[4] = {nullptr};  // NOLINT
-static uint16_t CHARCASES_MAP[65536] = {0};   // NOLINT
+static uint16_t CHAR_CASES_MAP[65536] = {0};  // NOLINT
 
 const uint8_t* GetUniFlagMap() {
   if (utils_map[1] == nullptr) {
@@ -32,16 +32,16 @@ const uint8_t* GetUniFlagMap() {
   return reinterpret_cast<const uint8_t*>(utils_map[1]);
 }
 
-const uint16_t* GetCharcasesMap() {
+const uint16_t* GetCharCasesMap() {
   if (utils_map[0] == nullptr) {
     for (uint32_t i = 0; i < 65536; ++i) {
       if (utf8proc_islower(static_cast<int32_t>(i))) {
-        CHARCASES_MAP[i] = utf8proc_toupper(static_cast<int32_t>(i));
+        CHAR_CASES_MAP[i] = utf8proc_toupper(static_cast<int32_t>(i));
       } else if (utf8proc_isupper(static_cast<int32_t>(i))) {
-        CHARCASES_MAP[i] = utf8proc_tolower(static_cast<int32_t>(i));
+        CHAR_CASES_MAP[i] = utf8proc_tolower(static_cast<int32_t>(i));
       }
     }
-    utils_map[0] = CHARCASES_MAP;
+    utils_map[0] = CHAR_CASES_MAP;
   }
   return reinterpret_cast<const uint16_t*>(utils_map[0]);
 }
@@ -67,21 +67,21 @@ const uint8_t* GetGPUUniflagMap() {
   return reinterpret_cast<const uint8_t*>(utils_map[3]);
 }
 
-const uint16_t* GetGPUCharcasesMap() {
+const uint16_t* GetGPUCharCasesMap() {
   if (utils_map[2] == nullptr) {
-    const uint16_t* cpu_charcases = GetCharcasesMap();
-    auto size = sizeof(CHARCASES_MAP);
-    uint16_t* gpu_charcases;
+    const uint16_t* cpu_char_cases = GetCharCasesMap();
+    auto size = sizeof(CHAR_CASES_MAP);
+    uint16_t* gpu_char_cases;
 #ifdef PADDLE_WITH_HIP
-    hipMalloc(reinterpret_cast<void**>(&gpu_charcases), size);
+    hipMalloc(reinterpret_cast<void**>(&gpu_char_cases), size);
     phi::backends::gpu::GpuMemcpySync(
-        gpu_charcases, cpu_charcases, size, hipMemcpyHostToDevice);
+        gpu_char_cases, cpu_char_cases, size, hipMemcpyHostToDevice);
 #else
-    cudaMalloc(reinterpret_cast<void**>(&gpu_charcases), size);
+    cudaMalloc(reinterpret_cast<void**>(&gpu_char_cases), size);
     phi::backends::gpu::GpuMemcpySync(
-        gpu_charcases, cpu_charcases, size, cudaMemcpyHostToDevice);
+        gpu_char_cases, cpu_char_cases, size, cudaMemcpyHostToDevice);
 #endif
-    utils_map[2] = gpu_charcases;
+    utils_map[2] = gpu_char_cases;
   }
   return reinterpret_cast<const uint16_t*>(utils_map[2]);
 }
diff --git a/paddle/phi/kernels/strings/unicode.h b/paddle/phi/kernels/strings/unicode.h
@@ -169,7 +169,7 @@ HOSTDEVICE inline uint32_t GetUTF8StrLen(const uint32_t* unicode_str,
   // +1 means '\0'
   return utf8_str_count + 1;
 }
-// Need to gurantee utf8_str has enough memory
+// Need to guarantee utf8_str has enough memory
 
 HOSTDEVICE inline void GetUTF8Str(const uint32_t* unicode_str,
                                   char* utf8_str,
@@ -186,12 +186,12 @@ HOSTDEVICE inline void GetUTF8Str(const uint32_t* unicode_str,
 }
 
 const uint8_t* GetUniFlagMap();
-const uint16_t* GetCharcasesMap();
+const uint16_t* GetCharCasesMap();
 
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
 
 const uint8_t* GetGPUUniflagMap();
-const uint16_t* GetGPUCharcasesMap();
+const uint16_t* GetGPUCharCasesMap();
 #endif
 
 }  // namespace strings
