From 93be3f4a0d5ec9da934b575a72e3600bc184d3c5 Mon Sep 17 00:00:00 2001
From: Yulong Wang <7679871+fs-eire@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:42:29 -0700
Subject: [PATCH] resolve comments (part2)

---
 onnxruntime/core/providers/webgpu/buffer_manager.cc | 5 ++---
 onnxruntime/core/providers/webgpu/tensor/gather.cc  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/onnxruntime/core/providers/webgpu/buffer_manager.cc b/onnxruntime/core/providers/webgpu/buffer_manager.cc
index 8751338d24178..be47eb7bb3c7b 100644
--- a/onnxruntime/core/providers/webgpu/buffer_manager.cc
+++ b/onnxruntime/core/providers/webgpu/buffer_manager.cc
@@ -191,9 +191,8 @@ class BucketCacheManager : public IBufferCacheManager {
     std::sort(buckets_keys_.begin(), buckets_keys_.end());
 
 #ifndef NDEBUG  // if debug build
-    for (size_t i = 0; i < buckets_keys_.size(); ++i) {
-      ORT_ENFORCE(buckets_keys_[i] % 16 == 0, "Bucket sizes must be multiples of 16.");
-    }
+    ORT_ENFORCE(std::all_of(buckets_keys_.begin(), buckets_keys_.end(), [](size_t size) { return size % 16 == 0; }),
+                "Bucket sizes must be multiples of 16.");
 
     for (size_t i = 1; i < buckets_keys_.size(); ++i) {
       ORT_ENFORCE(buckets_keys_[i] > buckets_keys_[i - 1], "Bucket sizes must be in increasing order.");
diff --git a/onnxruntime/core/providers/webgpu/tensor/gather.cc b/onnxruntime/core/providers/webgpu/tensor/gather.cc
index 47b78e7015135..2775fcd262a96 100644
--- a/onnxruntime/core/providers/webgpu/tensor/gather.cc
+++ b/onnxruntime/core/providers/webgpu/tensor/gather.cc
@@ -25,7 +25,7 @@ Status GatherProgram::GenerateShaderCode(ShaderHelper& shader) const {
                             << "  }\n"
                             << "  var data_indices : data_indices_t;\n";
   for (int i = 0, j = 0; i < data.Rank(); i++) {
-    if (i == SafeInt<int>(axis_)) {
+    if (static_cast<uint32_t>(i) == axis_) {
       shader.MainFunctionBody() << "  " << data.IndicesSet("data_indices", i, "u32(idx)") << ";\n";
       j += indices.Rank();
     } else {