Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions src/models/position_inputs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,19 +381,30 @@ void DefaultPositionInputs::InitializeSequenceLengths(std::array<int64_t, 2> sha

void DefaultPositionInputs::RewindMask(size_t index) {
Comment thread
qjia7 marked this conversation as resolved.
if (state_.params_->use_graph_capture) {
throw std::runtime_error("PositionInputs::RewindMask - Static buffer is not supported for continuous decoding.");
#if 0 // TODO: Fix implementation, cudaMemsetAsync of 1 is setting bytes of 1 vs int32's of 1
int past_length = static_cast<int>(index);
int max_length = static_cast<int>(state_.params_->search.max_length);
cudaMemsetAsync(attention_mask_->GetTensorMutableRawData(),
0,
(type_ == Ort::TypeToTensorType<int32_t> ? sizeof(int32_t) : sizeof(int64_t)) * max_length,
model_.cuda_stream_);
cudaMemsetAsync(attention_mask_->GetTensorMutableRawData(),
1,
(type_ == Ort::TypeToTensorType<int32_t> ? sizeof(int32_t) : sizeof(int64_t)) * past_length,
model_.cuda_stream_);
#endif
// Static mask layout: [batch_beam_size, max_length]
// Rewind to index: write 1s for [0, index), 0s for [index, max_length)
Comment thread
qjia7 marked this conversation as resolved.
size_t max_len = static_cast<size_t>(state_.params_->search.max_length);
if (index > max_len) {
throw std::runtime_error("RewindMask: index exceeds max_length");
}
int batch_beam_size = static_cast<int>(attention_mask_shape_[0]);
auto byte_span = attention_mask_->GetByteSpan();
auto cpu_data = byte_span.CpuSpan();
if (type_ == Ort::TypeToTensorType<int32_t>) {
auto* data = reinterpret_cast<int32_t*>(cpu_data.data());
Comment thread
baijumeswani marked this conversation as resolved.
for (int i = 0; i < batch_beam_size; i++) {
std::fill_n(data + i * max_len, index, static_cast<int32_t>(1));
std::fill_n(data + i * max_len + index, max_len - index, static_cast<int32_t>(0));
}
Comment thread
qjia7 marked this conversation as resolved.
} else {
auto* data = reinterpret_cast<int64_t*>(cpu_data.data());
Comment thread
baijumeswani marked this conversation as resolved.
for (int i = 0; i < batch_beam_size; i++) {
std::fill_n(data + i * max_len, index, static_cast<int64_t>(1));
std::fill_n(data + i * max_len + index, max_len - index, static_cast<int64_t>(0));
}
}
byte_span.CopyCpuToDevice();
return;
}
}

Expand Down
43 changes: 43 additions & 0 deletions src/webgpu/interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ struct InterfaceImpl : DeviceInterface {
private:
Ort::Allocator* ort_allocator_{};
const OrtMemoryInfo* ort_memory_info_{};
// Reusable CPU staging buffers for UpdateAttentionMask, pre-filled with 1s.
// Content is always all 1s so sharing across generators is safe; only upload_bytes
// worth of data is copied each call, regardless of buffer capacity.
std::vector<int32_t> mask_staging_buffer_i32_;
std::vector<int64_t> mask_staging_buffer_i64_;
Comment thread
qjia7 marked this conversation as resolved.

Comment thread
qjia7 marked this conversation as resolved.
public:
Ort::Allocator& GetAllocator() override {
Expand All @@ -190,6 +195,44 @@ struct InterfaceImpl : DeviceInterface {

void Synchronize() override {} // Nothing to do?

bool UpdateAttentionMask(void* next_mask_data, void* mask_data, int batch_beam_size, int new_kv_length, int total_length, int max_length, bool update_only, ONNXTensorElementDataType type) override {
Comment thread
kunal-vaishnavi marked this conversation as resolved.
Outdated
if (batch_beam_size != 1 || !update_only) {
return false; // Fall back to CPU for multi-beam or non-static mask
}
// For batch_beam_size == 1 with static mask (update_only=true, no padding),
// the mask is always all 1s for attended positions.
size_t num_elements = static_cast<size_t>(total_length);
size_t upload_bytes;
void* staging_data;

// Use the correctly typed staging buffer. Each grows monotonically and
// only newly extended positions need to be filled with 1.
if (type == Ort::TypeToTensorType<int32_t>) {
if (mask_staging_buffer_i32_.size() < num_elements) {
mask_staging_buffer_i32_.resize(num_elements, static_cast<int32_t>(1));
}
staging_data = mask_staging_buffer_i32_.data();
upload_bytes = num_elements * sizeof(int32_t);
} else {
if (mask_staging_buffer_i64_.size() < num_elements) {
mask_staging_buffer_i64_.resize(num_elements, static_cast<int64_t>(1));
}
staging_data = mask_staging_buffer_i64_.data();
upload_bytes = num_elements * sizeof(int64_t);
}

int64_t shape_val = static_cast<int64_t>(upload_bytes);
std::span<const int64_t> shape{&shape_val, 1};
auto cpu_mem_info = OrtMemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeDefault);
auto src_tensor = OrtValue::CreateTensor(*cpu_mem_info, staging_data, upload_bytes, shape, ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8);
auto dst_tensor = OrtValue::CreateTensor(*ort_memory_info_, mask_data, upload_bytes, shape, ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8);
Comment thread
qjia7 marked this conversation as resolved.
const std::vector<const OrtValue*> src_ptrs = {src_tensor.get()};
const std::vector<OrtValue*> dst_ptrs = {dst_tensor.get()};
Comment thread
qjia7 marked this conversation as resolved.
Outdated
GetOrtEnv().CopyTensors(src_ptrs, dst_ptrs, nullptr);

return true;
}

bool Cast(void* input, void* output, ONNXTensorElementDataType input_type, ONNXTensorElementDataType output_type, size_t element_count) override {
if (!ort_allocator_) {
throw std::runtime_error("WebGPU allocator not initialized");
Expand Down
Loading