Merge remote-tracking branch 'origin/fs-eire/webgpu-ep' into webgpu-e…

…p-gather
qjia7 · Sep 25, 2024 · bac2848 · bac2848
2 parents d734543 + 9bdbd85
commit bac2848
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/onnxruntime/core/providers/webgpu/shader_variable.cc b/onnxruntime/core/providers/webgpu/shader_variable.cc
@@ -88,12 +88,6 @@ ShaderIndicesHelper::ShaderIndicesHelper(std::string_view name, ProgramVariableD
       element_type_alias_{name_ + "_element_t"},
       indices_type_alias_{name_ + "_indices_t"} {}
 
-inline int ShaderIndicesHelper::Rank() {
-  // getting the rank means the information is exposed to the shader. So we consider it as a usage of shape and stride.
-  usage_ |= ShaderUsage::UseShapeAndStride;
-  return rank_;
-}
-
 ShaderVariableHelper::ShaderVariableHelper(std::string_view name, ProgramVariableDataType type, ShaderUsage usage, const TensorShape& dims)
     : ShaderIndicesHelper{name, type, usage, dims} {
   ORT_ENFORCE(type_ != ProgramVariableDataType::InvalidType, "Invalid type for variable ", name_);

diff --git a/onnxruntime/core/providers/webgpu/shader_variable.h b/onnxruntime/core/providers/webgpu/shader_variable.h
@@ -71,7 +71,7 @@ class ShaderIndicesHelper {
   inline int NumComponents() const { return num_components_; }
 
   // get the rank of the indices.
-  inline int Rank();
+  inline int Rank() const;
 
   // create a WGSL expression ({varname}_indices_t) for getting indices from offset.
   // \param offset: a WGSL expression (u32) representing the offset.
@@ -213,6 +213,12 @@ std::string pass_as_string(T&& v) {
 }
 }  // namespace detail
 
+inline int ShaderIndicesHelper::Rank() const {
+  // getting the rank means the information is exposed to the shader. So we consider it as a usage of shape and stride.
+  usage_ |= ShaderUsage::UseShapeAndStride;
+  return rank_;
+}
+
 inline std::string ShaderIndicesHelper::OffsetToIndices(std::string_view offset_expr) const {
   usage_ |= ShaderUsage::UseOffsetToIndices | ShaderUsage::UseShapeAndStride;
   return rank_ < 2 ? std::string{offset_expr}