Fix another merge error

onnxruntime/core/providers/shared_library/provider_api.h

@@ -181,6 +181,7 @@ using NodeArgInfo = ONNX_NAMESPACE::ValueInfoProto;
 #include "core/framework/tensorprotoutils.h"
 #include "core/providers/common.h"
 #include "core/providers/op_kernel_type_control_utils.h"
+#include "core/util/math.h"
 
 namespace onnxruntime {
 
@@ -242,21 +243,6 @@ struct Category {
 
 }  // namespace logging
 
-namespace math {
-
-// Rounds a up to the next highest multiple of b, which is power-of-2. User must be careful
-// to ensure that there is no overflow or underflow in the calculation
-// of divUp.
-template <typename T, T b>
-constexpr T roundUpPow2(T a) {
-  return (a + (b - 1)) & (~(b - 1));
-}
-
-uint16_t floatToHalf(float f);
-float halfToFloat(uint16_t h);
-
-}  // namespace math
-
 namespace utils {
 
 template <typename T>

onnxruntime/core/util/math.h

@@ -16,8 +16,10 @@
 
 #pragma once
 
+#ifndef SHARED_PROVIDER
 #include "core/common/common.h"
 #include "core/framework/tensor.h"
+#endif
 
 #ifndef CBLAS_ENUM_DEFINED_H
 #define CBLAS_ENUM_DEFINED_H