resolve comments (part1)

Author: fs-eire

onnxruntime/contrib_ops/webgpu/bert/multihead_attention.cc

@@ -168,7 +168,7 @@ Status ComputeAttentionProbs(onnxruntime::webgpu::ComputeContext& context, int o
   const bool feed_past_key = present_key != nullptr && past_key != nullptr && past_key->SizeInBytes() > 0;
   const bool has_present_key = output_count > 1 && past_key;
   const bool has_attention_bias = attention_bias != nullptr;
-  const int tile_size = 12;
+  constexpr int tile_size = 12;
   const int components = parameters.head_size % 4 == 0 ? 4 : (parameters.head_size % 2 == 0 ? 2 : 1);
 
   AttentionProbsProgram program{"AttentionProbs", feed_past_key, has_present_key, has_attention_bias, tile_size,

onnxruntime/core/providers/webgpu/shader_variable.cc

@@ -14,7 +14,7 @@ namespace onnxruntime {
 namespace webgpu {
 
 namespace {
-constexpr static const std::string_view STORAGE_TYPE[] = {
+constexpr static const std::string_view STORAGE_TYPE_ARRAY[] = {
     "f32",        // Float32
     "vec2<f32>",  // Float32x2
     "vec4<f32>",  // Float32x4
@@ -34,8 +34,9 @@ constexpr static const std::string_view STORAGE_TYPE[] = {
     "vec2<u32>",  // Uint8x8
     "vec4<u32>",  // Uint8x16
 };
+constexpr static const auto STORAGE_TYPE = details::_to_std_array(STORAGE_TYPE_ARRAY);
 
-constexpr static const std::string_view VALUE_TYPE[] = {
+constexpr static const std::string_view VALUE_TYPE_ARRAY[] = {
     "f32",         // Float32
     "vec2<f32>",   // Float32x2
     "vec4<f32>",   // Float32x4
@@ -55,8 +56,9 @@ constexpr static const std::string_view VALUE_TYPE[] = {
     "vec2<u32>",   // Uint8x8 (vec2<u32> as 2x4 elements of uint8)
     "vec4<u32>",   // Uint8x16 (vec4<u32> as 4x4 elements of uint8)
 };
+constexpr static const auto VALUE_TYPE = details::_to_std_array(VALUE_TYPE_ARRAY);
 
-constexpr static const std::string_view ELEMENT_TYPE[] = {
+constexpr static const std::string_view ELEMENT_TYPE_ARRAY[] = {
     "f32",   // Float32
     "f32",   // Float32x2
     "f32",   // Float32x4
@@ -76,6 +78,7 @@ constexpr static const std::string_view ELEMENT_TYPE[] = {
     "u32",   // Uint8x8
     "u32",   // Uint8x16
 };
+constexpr static const auto ELEMENT_TYPE = details::_to_std_array(ELEMENT_TYPE_ARRAY);
 
 inline std::string GetIndicesType(int rank) {
   return rank < 2 ? "u32"

onnxruntime/core/providers/webgpu/tensor/where.cc

@@ -31,10 +31,10 @@ Status ComputeOutputShape(const TensorShape& cond_shape,
     if (i < y_rank)
       y_dim = y_shape[y_rank - 1 - i];
 
-    int64_t output_dim = std::max(std::max(cond_dim, x_dim), y_dim);
+    int64_t output_dim = std::max({cond_dim, x_dim, y_dim});
     // special case to handle a dim of 0 which can be broadcast with a 1
     if (output_dim == 1)
-      output_dim = std::min(std::min(cond_dim, x_dim), y_dim);
+      output_dim = std::min({cond_dim, x_dim, y_dim});
 
     const auto node_name = "Where";
     if (cond_dim != output_dim && cond_dim != 1)