Skip to content

Commit a4861a6

Browse files
author
ssjia
committed
Update base for Update on "[ET-VK][ez] Allow high dimensional tensors (for buffer storage)"
Differential Revision: [D80800083](https://our.internmc.facebook.com/intern/diff/D80800083) [ghstack-poisoned]
1 parent e34d487 commit a4861a6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

backends/vulkan/runtime/api/containers/Tensor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ const vkapi::BufferBindInfo vTensor::numel_ubo() {
835835
}
836836

837837
const vkapi::BufferBindInfo vTensor::buffer_meta_ubo() {
838-
size_t ubo_nbytes = std::min(sizeof(BufferMetadata), min_nbytes_per_ubo_);
838+
size_t ubo_nbytes = std::max(sizeof(BufferMetadata), min_nbytes_per_ubo_);
839839
if (!buffer_meta_.buffer()) {
840840
BufferMetadata data(sizes_, dim_order_, strides_, numel_);
841841
buffer_meta_ = ParamsBuffer(storage_->context_, data);

backends/vulkan/runtime/api/containers/Tensor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ class vTensor final {
548548
if (!uniforms_.buffer()) {
549549
uniforms_ = ParamsBuffer(storage_->context_, max_ubo_nbytes_, true);
550550
}
551-
size_t ubo_nbytes = std::min(sizeof(T), min_nbytes_per_ubo_);
551+
size_t ubo_nbytes = std::max(sizeof(T), min_nbytes_per_ubo_);
552552
if (*param_buffer_offset == kUniformOffsetUnset) {
553553
VK_CHECK_COND(
554554
(uniforms_size_ + ubo_nbytes) <= max_ubo_nbytes_,

backends/vulkan/runtime/graph/ops/glsl/indexing.glslh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void printTensorIndex(const TensorIndex tidx) {
187187

188188
void printBufferMetadata(const BufferMetadata meta) {
189189
debugPrintfEXT(
190-
"BufferMetadata: ndim=%u numel=%u\\n sizes=[%u %u %u %u %u %u %u %u]\\n dim_order=[%u %u %u %u %u %u %u %u]\\n strides=[%u %u %u %u %u %u %u %u]\\n",
190+
"BufferMetadata: ndim=%u numel=%u\\n sizes=[%u %u %u %u %u %u %u %u]\\n dim_order=[%u %u %u %u %u %u %u %u]\\n strides=[%u %u %u %u %u %u %u %u]\\n",
191191
meta.ndim_numel[0], meta.ndim_numel[1],
192192
meta.sizes[0][0], meta.sizes[0][1], meta.sizes[0][2], meta.sizes[0][3],
193193
meta.sizes[1][1], meta.sizes[1][1], meta.sizes[1][2], meta.sizes[1][3],

0 commit comments

Comments
 (0)