From 5ad7eb40cf2471b5c3d00693d2f94d65ea684112 Mon Sep 17 00:00:00 2001 From: Randy Shuai Date: Wed, 9 Aug 2023 18:15:12 -0700 Subject: [PATCH] move static --- .../testdata/custom_op_library/cpu/cpu_ops.cc | 22 +++++++++---------- .../custom_op_library/cuda/cuda_ops.cc | 3 +-- .../testdata/custom_op_library/dml/dml_ops.cc | 3 +-- .../custom_op_library/rocm/rocm_ops.cc | 3 +-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/onnxruntime/test/testdata/custom_op_library/cpu/cpu_ops.cc b/onnxruntime/test/testdata/custom_op_library/cpu/cpu_ops.cc index 41553d4b75719..f9e537fb61047 100644 --- a/onnxruntime/test/testdata/custom_op_library/cpu/cpu_ops.cc +++ b/onnxruntime/test/testdata/custom_op_library/cpu/cpu_ops.cc @@ -162,21 +162,21 @@ void FilterFloat8(const Ort::Custom::Tensor& floats_in, } #endif -static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "CPUExecutionProvider", KernelOne)}; -static const std::unique_ptr c_CustomOpTwo{Ort::Custom::CreateLiteCustomOp("CustomOpTwo", "CPUExecutionProvider", KernelTwo)}; -static const std::unique_ptr c_MulTopOpFloat{Ort::Custom::CreateLiteCustomOp("MulTop", "CPUExecutionProvider", MulTop)}; -static const std::unique_ptr c_MulTopOpInt32{Ort::Custom::CreateLiteCustomOp("MulTop", "CPUExecutionProvider", MulTop)}; -static const std::unique_ptr c_Fuse{Ort::Custom::CreateLiteCustomOp("Fuse", "CPUExecutionProvider", Fuse)}; -static const std::unique_ptr c_Select{Ort::Custom::CreateLiteCustomOp("Select", "CPUExecutionProvider", Select)}; -static const std::unique_ptr c_Fill{Ort::Custom::CreateLiteCustomOp("Filter", "CPUExecutionProvider", Filter)}; -static const std::unique_ptr c_Box{Ort::Custom::CreateLiteCustomOp("Box", "CPUExecutionProvider", Box)}; +void RegisterOps(Ort::CustomOpDomain& domain) { + static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "CPUExecutionProvider", KernelOne)}; + static const std::unique_ptr c_CustomOpTwo{Ort::Custom::CreateLiteCustomOp("CustomOpTwo", "CPUExecutionProvider", KernelTwo)}; + static const std::unique_ptr c_MulTopOpFloat{Ort::Custom::CreateLiteCustomOp("MulTop", "CPUExecutionProvider", MulTop)}; + static const std::unique_ptr c_MulTopOpInt32{Ort::Custom::CreateLiteCustomOp("MulTop", "CPUExecutionProvider", MulTop)}; + static const std::unique_ptr c_Fuse{Ort::Custom::CreateLiteCustomOp("Fuse", "CPUExecutionProvider", Fuse)}; + static const std::unique_ptr c_Select{Ort::Custom::CreateLiteCustomOp("Select", "CPUExecutionProvider", Select)}; + static const std::unique_ptr c_Fill{Ort::Custom::CreateLiteCustomOp("Filter", "CPUExecutionProvider", Filter)}; + static const std::unique_ptr c_Box{Ort::Custom::CreateLiteCustomOp("Box", "CPUExecutionProvider", Box)}; #if !defined(DISABLE_FLOAT8_TYPES) -static const CustomOpOneFloat8 c_CustomOpOneFloat8; -static const std::unique_ptr c_FilterFloat8{Ort::Custom::CreateLiteCustomOp("FilterFloat8", "CPUExecutionProvider", FilterFloat8)}; + static const CustomOpOneFloat8 c_CustomOpOneFloat8; + static const std::unique_ptr c_FilterFloat8{Ort::Custom::CreateLiteCustomOp("FilterFloat8", "CPUExecutionProvider", FilterFloat8)}; #endif -void RegisterOps(Ort::CustomOpDomain& domain) { domain.Add(c_CustomOpOne.get()); domain.Add(c_CustomOpTwo.get()); domain.Add(c_MulTopOpFloat.get()); diff --git a/onnxruntime/test/testdata/custom_op_library/cuda/cuda_ops.cc b/onnxruntime/test/testdata/custom_op_library/cuda/cuda_ops.cc index 78e7deea24dd7..aba35b33b75c6 100644 --- a/onnxruntime/test/testdata/custom_op_library/cuda/cuda_ops.cc +++ b/onnxruntime/test/testdata/custom_op_library/cuda/cuda_ops.cc @@ -36,9 +36,8 @@ void KernelOne(const Ort::Custom::CudaContext& cuda_ctx, cuda_add(Z.NumberOfElement(), z_raw, X.Data(), Y.Data(), cuda_ctx.cuda_stream); } -static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "CUDAExecutionProvider", KernelOne)}; - void RegisterOps(Ort::CustomOpDomain& domain) { + static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "CUDAExecutionProvider", KernelOne)}; domain.Add(c_CustomOpOne.get()); } diff --git a/onnxruntime/test/testdata/custom_op_library/dml/dml_ops.cc b/onnxruntime/test/testdata/custom_op_library/dml/dml_ops.cc index 3f09a40c9d7a9..eec2424318a36 100644 --- a/onnxruntime/test/testdata/custom_op_library/dml/dml_ops.cc +++ b/onnxruntime/test/testdata/custom_op_library/dml/dml_ops.cc @@ -33,9 +33,8 @@ void KernelOne(const Ort::Custom::DmlContext& dml_ctx, // todo - implement element-wise add for DML } -static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "DMLExecutionProvider", KernelOne)}; - void RegisterOps(Ort::CustomOpDomain& domain) { + static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "DMLExecutionProvider", KernelOne)}; domain.Add(c_CustomOpOne.get()); } diff --git a/onnxruntime/test/testdata/custom_op_library/rocm/rocm_ops.cc b/onnxruntime/test/testdata/custom_op_library/rocm/rocm_ops.cc index c1db00ff7d496..113bfb85454a2 100644 --- a/onnxruntime/test/testdata/custom_op_library/rocm/rocm_ops.cc +++ b/onnxruntime/test/testdata/custom_op_library/rocm/rocm_ops.cc @@ -33,9 +33,8 @@ void KernelOne(const Ort::Custom::RocmContext& rocm_ctx, rocm_add(Z.NumberOfElement(), z_raw, X.Data(), Y.Data(), rocm_ctx.hip_stream); } -static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "ROCMExecutionProvider", KernelOne)}; - void RegisterOps(Ort::CustomOpDomain& domain) { + static const std::unique_ptr c_CustomOpOne{Ort::Custom::CreateLiteCustomOp("CustomOpOne", "ROCMExecutionProvider", KernelOne)}; domain.Add(c_CustomOpOne.get()); }