Skip to content

Commit 4ef7a81

Browse files
hariharans29hariharans29
committed
Rename Zeroing
1 parent edb352d commit 4ef7a81

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎onnxruntime/core/providers/cpu/cpu_provider_shared.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ struct ProviderHostCPUImpl : ProviderHostCPU {
186186
std::unique_ptr<EinsumTypedComputeProcessor<float>> EinsumTypedComputeProcessor_float__Create(OpKernelContext* context, AllocatorPtr allocator, concurrency::ThreadPool* tp, EinsumComputePreprocessor& einsum_compute_preprocessor, void* einsum_cuda_assets) override { return std::make_unique<EinsumTypedComputeProcessor<float>>(context, allocator, tp, einsum_compute_preprocessor, einsum_cuda_assets); }
187187
std::unique_ptr<EinsumTypedComputeProcessor<double>> EinsumTypedComputeProcessor_double__Create(OpKernelContext* context, AllocatorPtr allocator, concurrency::ThreadPool* tp, EinsumComputePreprocessor& einsum_compute_preprocessor, void* einsum_cuda_assets) override { return std::make_unique<EinsumTypedComputeProcessor<double>>(context, allocator, tp, einsum_compute_preprocessor, einsum_cuda_assets); }
188188
std::unique_ptr<EinsumTypedComputeProcessor<MLFloat16>> EinsumTypedComputeProcessor_MLFloat16__Create(OpKernelContext* context, AllocatorPtr allocator, concurrency::ThreadPool* tp, EinsumComputePreprocessor& einsum_compute_preprocessor, void* einsum_cuda_assets) override { return std::make_unique<EinsumTypedComputeProcessor<MLFloat16>>(context, allocator, tp, einsum_compute_preprocessor, einsum_cuda_assets); }
189-
void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<float>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<float>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<float>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) override { return p->SetDeviceHelpers(device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func); }
190-
void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<double>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<double>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<double>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) override { return p->SetDeviceHelpers(device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func); }
191-
void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<MLFloat16>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<MLFloat16>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<MLFloat16>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) override { return p->SetDeviceHelpers(device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func); }
189+
void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<float>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<float>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<float>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) override { return p->SetDeviceHelpers(device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func); }
190+
void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<double>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<double>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<double>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) override { return p->SetDeviceHelpers(device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func); }
191+
void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<MLFloat16>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<MLFloat16>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<MLFloat16>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) override { return p->SetDeviceHelpers(device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func); }
192192
Status EinsumTypedComputeProcessor__Run(EinsumTypedComputeProcessor<float>* p) override { return p->Run(); }
193193
Status EinsumTypedComputeProcessor__Run(EinsumTypedComputeProcessor<double>* p) override { return p->Run(); }
194194
Status EinsumTypedComputeProcessor__Run(EinsumTypedComputeProcessor<MLFloat16>* p) override { return p->Run(); }

‎onnxruntime/core/providers/cpu/cpu_provider_shared.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ struct ProviderHostCPU {
117117
virtual std::unique_ptr<EinsumTypedComputeProcessor<float>> EinsumTypedComputeProcessor_float__Create(OpKernelContext* context, AllocatorPtr allocator, concurrency::ThreadPool* tp, EinsumComputePreprocessor& einsum_compute_preprocessor, void* einsum_cuda_assets) = 0;
118118
virtual std::unique_ptr<EinsumTypedComputeProcessor<double>> EinsumTypedComputeProcessor_double__Create(OpKernelContext* context, AllocatorPtr allocator, concurrency::ThreadPool* tp, EinsumComputePreprocessor& einsum_compute_preprocessor, void* einsum_cuda_assets) = 0;
119119
virtual std::unique_ptr<EinsumTypedComputeProcessor<MLFloat16>> EinsumTypedComputeProcessor_MLFloat16__Create(OpKernelContext* context, AllocatorPtr allocator, concurrency::ThreadPool* tp, EinsumComputePreprocessor& einsum_compute_preprocessor, void* einsum_cuda_assets) = 0;
120-
virtual void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<float>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<float>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<float>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) = 0;
121-
virtual void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<double>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<double>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<double>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) = 0;
122-
virtual void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<MLFloat16>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<MLFloat16>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<MLFloat16>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) = 0;
120+
virtual void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<float>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<float>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<float>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) = 0;
121+
virtual void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<double>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<double>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<double>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) = 0;
122+
virtual void EinsumTypedComputeProcessor__SetDeviceHelpers(EinsumTypedComputeProcessor<MLFloat16>* p, const EinsumOp::DeviceHelpers::Transpose& device_transpose_func, const EinsumOp::DeviceHelpers::MatMul<MLFloat16>& device_matmul_func, const EinsumOp::DeviceHelpers::ReduceSum<MLFloat16>& device_reduce_sum_func, const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func, const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) = 0;
123123
virtual Status EinsumTypedComputeProcessor__Run(EinsumTypedComputeProcessor<float>* p) = 0;
124124
virtual Status EinsumTypedComputeProcessor__Run(EinsumTypedComputeProcessor<double>* p) = 0;
125125
virtual Status EinsumTypedComputeProcessor__Run(EinsumTypedComputeProcessor<MLFloat16>* p) = 0;
@@ -297,7 +297,7 @@ struct EinsumTypedComputeProcessor {
297297
const EinsumOp::DeviceHelpers::MatMul<T>& device_matmul_func,
298298
const EinsumOp::DeviceHelpers::ReduceSum<T>& device_reduce_sum_func,
299299
const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func,
300-
const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) {
300+
const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) {
301301
g_host_cpu.EinsumTypedComputeProcessor__SetDeviceHelpers(this, device_transpose_func, device_matmul_func, device_reduce_sum_func, device_data_copy_func, device_zero_buffer_func);
302302
}
303303

‎onnxruntime/core/providers/cpu/math/einsum.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
6666
EinsumOp::DeviceHelpers::CpuDeviceHelpers::MatMul<float>,
6767
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ReduceSum<float>,
6868
EinsumOp::DeviceHelpers::CpuDeviceHelpers::DataCopy,
69-
EinsumOp::DeviceHelpers::CpuDeviceHelpers::Zeroing);
69+
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ZeroBuffer);
7070
return einsum_compute_processor.Run();
7171
} else if (inputs[0]->IsDataType<int32_t>()) {
7272
auto einsum_compute_processor = EinsumTypedComputeProcessor<int32_t>(context,
@@ -80,7 +80,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
8080
EinsumOp::DeviceHelpers::CpuDeviceHelpers::MatMul<int32_t>,
8181
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ReduceSum<int32_t>,
8282
EinsumOp::DeviceHelpers::CpuDeviceHelpers::DataCopy,
83-
EinsumOp::DeviceHelpers::CpuDeviceHelpers::Zeroing);
83+
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ZeroBuffer);
8484

8585
return einsum_compute_processor.Run();
8686
} else if (inputs[0]->IsDataType<double>()) {
@@ -95,7 +95,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
9595
EinsumOp::DeviceHelpers::CpuDeviceHelpers::MatMul<double>,
9696
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ReduceSum<double>,
9797
EinsumOp::DeviceHelpers::CpuDeviceHelpers::DataCopy,
98-
EinsumOp::DeviceHelpers::CpuDeviceHelpers::Zeroing);
98+
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ZeroBuffer);
9999
return einsum_compute_processor.Run();
100100
} else if (inputs[0]->IsDataType<int64_t>()) {
101101
auto einsum_compute_processor = EinsumTypedComputeProcessor<int64_t>(context,
@@ -108,7 +108,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
108108
EinsumOp::DeviceHelpers::CpuDeviceHelpers::MatMul<int64_t>,
109109
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ReduceSum<int64_t>,
110110
EinsumOp::DeviceHelpers::CpuDeviceHelpers::DataCopy,
111-
EinsumOp::DeviceHelpers::CpuDeviceHelpers::Zeroing);
111+
EinsumOp::DeviceHelpers::CpuDeviceHelpers::ZeroBuffer);
112112

113113
return einsum_compute_processor.Run();
114114
}

‎onnxruntime/core/providers/cpu/math/einsum_utils/einsum_auxiliary_ops.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Status DataCopy(const Tensor& input, Tensor& output, void* /*einsum_cuda_assets*
2222
return Status::OK();
2323
}
2424

25-
// CPU specific Zeroing helper
26-
Status Zeroing(Tensor& input, void* /*einsum_cuda_assets*/) {
25+
// CPU specific Zero buffer helper
26+
Status ZeroBuffer(Tensor& input, void* /*einsum_cuda_assets*/) {
2727
memset(input.MutableDataRaw(), 0, input.SizeInBytes());
2828
return Status::OK();
2929
}

‎onnxruntime/core/providers/cpu/math/einsum_utils/einsum_auxiliary_ops.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ namespace DeviceHelpers {
2727
// Data copy op - Copies raw data from the source tensor's buffer to the destination tensor's buffer
2828
using DataCopy = std::function<Status(const Tensor& input, Tensor& output, void* einsum_cuda_assets)>;
2929

30-
// Zeroing op - Sets all bytes in the tensor's buffer to zero
31-
using Zeroing = std::function<Status(Tensor& input, void* einsum_cuda_assets)>;
30+
// Zero buffer op - Sets all bytes in the tensor's buffer to zero
31+
using ZeroBuffer = std::function<Status(Tensor& input, void* einsum_cuda_assets)>;
3232

3333
// Transpose op - Transposes given input based on data in `permutation`
3434
using Transpose = std::function<Status(const gsl::span<const size_t>& permutation, const Tensor& input,
@@ -66,7 +66,7 @@ namespace CpuDeviceHelpers {
6666

6767
Status DataCopy(const Tensor& input, Tensor& output, void* einsum_cuda_assets);
6868

69-
Status Zeroing(Tensor& input, void* einsum_cuda_assets);
69+
Status ZeroBuffer(Tensor& input, void* einsum_cuda_assets);
7070

7171
Status Transpose(const gsl::span<const size_t>& permutation, const Tensor& input,
7272
Tensor& output, const TensorShape* input_shape_override, void* einsum_cuda_assets);

‎onnxruntime/core/providers/cpu/math/einsum_utils/einsum_typed_compute_processor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void EinsumTypedComputeProcessor<T>::SetDeviceHelpers(const EinsumOp::DeviceHelp
337337
const EinsumOp::DeviceHelpers::MatMul<T>& device_matmul_func,
338338
const EinsumOp::DeviceHelpers::ReduceSum<T>& device_reduce_sum_func,
339339
const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func,
340-
const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func) {
340+
const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func) {
341341
device_transpose_func_ = device_transpose_func;
342342
device_matmul_func_ = device_matmul_func;
343343
device_reduce_sum_func_ = device_reduce_sum_func;

‎onnxruntime/core/providers/cpu/math/einsum_utils/einsum_typed_compute_processor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class EinsumTypedComputeProcessor {
3232
const EinsumOp::DeviceHelpers::MatMul<T>& device_matmul_func,
3333
const EinsumOp::DeviceHelpers::ReduceSum<T>& device_reduce_sum_func,
3434
const EinsumOp::DeviceHelpers::DataCopy& device_data_copy_func,
35-
const EinsumOp::DeviceHelpers::Zeroing& device_zero_buffer_func);
35+
const EinsumOp::DeviceHelpers::ZeroBuffer& device_zero_buffer_func);
3636

3737
Status Run();
3838

@@ -65,7 +65,7 @@ class EinsumTypedComputeProcessor {
6565
EinsumOp::DeviceHelpers::MatMul<T> device_matmul_func_;
6666
EinsumOp::DeviceHelpers::ReduceSum<T> device_reduce_sum_func_;
6767
EinsumOp::DeviceHelpers::DataCopy device_data_copy_func_;
68-
EinsumOp::DeviceHelpers::Zeroing device_zero_buffer_func_;
68+
EinsumOp::DeviceHelpers::ZeroBuffer device_zero_buffer_func_;
6969

7070
// Holds EP-specific assets required for (auxiliary) ops that need to be executed on non-CPU EPs
7171
void* einsum_ep_assets_;

‎onnxruntime/core/providers/cuda/math/einsum.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
5353
EinsumOp::DeviceHelpers::CudaDeviceHelpers::MatMul<float>,
5454
EinsumOp::DeviceHelpers::CudaDeviceHelpers::ReduceSum<float>,
5555
EinsumOp::DeviceHelpers::CudaDeviceHelpers::DataCopy,
56-
EinsumOp::DeviceHelpers::CudaDeviceHelpers::Zeroing);
56+
EinsumOp::DeviceHelpers::CudaDeviceHelpers::ZeroBuffer);
5757
return einsum_compute_processor->Run();
5858
} else if (inputs[0]->IsDataType<double>()) {
5959
auto einsum_compute_processor = EinsumTypedComputeProcessor<double>::Create(context, allocator, tp,
@@ -65,7 +65,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
6565
EinsumOp::DeviceHelpers::CudaDeviceHelpers::MatMul<double>,
6666
EinsumOp::DeviceHelpers::CudaDeviceHelpers::ReduceSum<double>,
6767
EinsumOp::DeviceHelpers::CudaDeviceHelpers::DataCopy,
68-
EinsumOp::DeviceHelpers::CudaDeviceHelpers::Zeroing);
68+
EinsumOp::DeviceHelpers::CudaDeviceHelpers::ZeroBuffer);
6969
return einsum_compute_processor->Run();
7070
} else if (inputs[0]->IsDataType<MLFloat16>()) {
7171
auto einsum_compute_processor = EinsumTypedComputeProcessor<MLFloat16>::Create(context, allocator, tp,
@@ -76,7 +76,7 @@ Status Einsum::DeviceCompute(OpKernelContext* context, const std::vector<const T
7676
EinsumOp::DeviceHelpers::CudaDeviceHelpers::MatMul<MLFloat16>,
7777
EinsumOp::DeviceHelpers::CudaDeviceHelpers::ReduceSum<MLFloat16>,
7878
EinsumOp::DeviceHelpers::CudaDeviceHelpers::DataCopy,
79-
EinsumOp::DeviceHelpers::CudaDeviceHelpers::Zeroing);
79+
EinsumOp::DeviceHelpers::CudaDeviceHelpers::ZeroBuffer);
8080
return einsum_compute_processor->Run();
8181
}
8282

‎onnxruntime/core/providers/cuda/math/einsum_utils/einsum_auxiliary_ops.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Status DataCopy(const Tensor& input, Tensor& output, void* einsum_cuda_assets) {
3131
return Status::OK();
3232
}
3333

34-
// CUDA EP specific Zeroing helper
35-
Status Zeroing(Tensor& input, void* einsum_cuda_assets) {
34+
// CUDA EP specific Zero buffer helper
35+
Status ZeroBuffer(Tensor& input, void* einsum_cuda_assets) {
3636
CUDA_RETURN_IF_ERROR(cudaMemsetAsync(input.MutableDataRaw(), 0, input.SizeInBytes(),
3737
static_cast<EinsumCudaAssets*>(einsum_cuda_assets)->GetCudaStream()));
3838
return Status::OK();

‎onnxruntime/core/providers/cuda/math/einsum_utils/einsum_auxiliary_ops.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Status Transpose(const gsl::span<const size_t>& permutation, const Tensor& input
4747

4848
Status DataCopy(const Tensor& input, Tensor& output, void* einsum_cuda_assets);
4949

50-
Status Zeroing(Tensor& input, void* einsum_cuda_assets);
50+
Status ZeroBuffer(Tensor& input, void* einsum_cuda_assets);
5151

5252
template <typename T>
5353
Status MatMul(const T* input_1_data, const T* input_2_data, T* output_data,

0 commit comments

Comments
 (0)