From 31cbb5d33de775dae852a4b566e3a82cadcc1c0e Mon Sep 17 00:00:00 2001 From: KeDengMS Date: Mon, 13 May 2019 10:08:27 -0700 Subject: [PATCH] Add support for int32_t in CPU provider's Where op (#1009) This is required for running BiDAF model. https://github.com/onnx/models/pull/157 --- onnxruntime/core/providers/cpu/cpu_execution_provider.cc | 2 ++ onnxruntime/core/providers/cpu/tensor/where_op.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/onnxruntime/core/providers/cpu/cpu_execution_provider.cc b/onnxruntime/core/providers/cpu/cpu_execution_provider.cc index 11e251de43..06f9c395dd 100644 --- a/onnxruntime/core/providers/cpu/cpu_execution_provider.cc +++ b/onnxruntime/core/providers/cpu/cpu_execution_provider.cc @@ -235,6 +235,7 @@ class ONNX_OPERATOR_TYPED_KERNEL_CLASS_NAME(kCpuExecutionProvider, kOnnxDomain, class ONNX_OPERATOR_TYPED_KERNEL_CLASS_NAME(kCpuExecutionProvider, kOnnxDomain, 9, int64_t, NonZero); class ONNX_OPERATOR_TYPED_KERNEL_CLASS_NAME(kCpuExecutionProvider, kOnnxDomain, 9, string, Where); class ONNX_OPERATOR_TYPED_KERNEL_CLASS_NAME(kCpuExecutionProvider, kOnnxDomain, 9, float, Where); +class ONNX_OPERATOR_TYPED_KERNEL_CLASS_NAME(kCpuExecutionProvider, kOnnxDomain, 9, int32_t, Where); // Opset 10 class ONNX_OPERATOR_KERNEL_CLASS_NAME(kCpuExecutionProvider, kOnnxDomain, 10, StringNormalizer); @@ -496,6 +497,7 @@ void RegisterOnnxOperatorKernels(KernelRegistry& kernel_registry) { BuildKernelCreateInfo, BuildKernelCreateInfo, BuildKernelCreateInfo, + BuildKernelCreateInfo, // Opset 10 BuildKernelCreateInfo, diff --git a/onnxruntime/core/providers/cpu/tensor/where_op.cc b/onnxruntime/core/providers/cpu/tensor/where_op.cc index 62176f0e05..83bbbd17f7 100644 --- a/onnxruntime/core/providers/cpu/tensor/where_op.cc +++ b/onnxruntime/core/providers/cpu/tensor/where_op.cc @@ -28,7 +28,7 @@ namespace onnxruntime { //WHERE_TYPED_KERNEL(uint64_t) //WHERE_TYPED_KERNEL(int8_t) //WHERE_TYPED_KERNEL(int16_t) -//WHERE_TYPED_KERNEL(int32_t) +WHERE_TYPED_KERNEL(int32_t) //WHERE_TYPED_KERNEL(int64_t) //WHERE_TYPED_KERNEL(MLFloat16) //WHERE_TYPED_KERNEL(BFloat16)