Provide overload to cope with const-ness change of NumPy's PyUFuncGenericFunction.

chsigg · tensorflower-gardener · commit 75ea0b31477d · 2020-06-26T05:16:31.000-07:00
See #40688, #40654. PiperOrigin-RevId: 318452381 Change-Id: Icc5152f2b020ef19882a49e3c86ac80bbe048d64
diff --git a/tensorflow/python/lib/core/bfloat16.cc b/tensorflow/python/lib/core/bfloat16.cc
@@ -517,7 +517,7 @@ bool RegisterBfloat16Cast(int numpy_type, bool cast_is_safe) {
 }
 
 template <typename InType, typename OutType, typename Functor>
-void BinaryUFunc(char** args, npy_intp* dimensions, npy_intp* steps,
+void BinaryUFunc(char** args, const npy_intp* dimensions, const npy_intp* steps,
                  void* data) {
   const char* i0 = args[0];
   const char* i1 = args[1];
@@ -532,11 +532,17 @@ void BinaryUFunc(char** args, npy_intp* dimensions, npy_intp* steps,
   }
 }
 
+// Numpy changed const-ness of PyUFuncGenericFunction, provide overload.
 template <typename Functor>
 void CompareUFunc(char** args, npy_intp* dimensions, npy_intp* steps,
                   void* data) {
   BinaryUFunc<bfloat16, npy_bool, Functor>(args, dimensions, steps, data);
 }
+template <typename Functor>
+void CompareUFunc(char** args, const npy_intp* dimensions,
+                  const npy_intp* steps, void* data) {
+  BinaryUFunc<bfloat16, npy_bool, Functor>(args, dimensions, steps, data);
+}
 
 struct Bfloat16EqFunctor {
   npy_bool operator()(bfloat16 a, bfloat16 b) { return a == b; }

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ bool RegisterBfloat16Cast(int numpy_type, bool cast_is_safe) {`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`template <typename InType, typename OutType, typename Functor>`
`520`		`-void BinaryUFunc(char** args, npy_intp* dimensions, npy_intp* steps,`
	`520`	`+void BinaryUFunc(char** args, const npy_intp* dimensions, const npy_intp* steps,`
`521`	`521`	`void* data) {`
`522`	`522`	`const char* i0 = args[0];`
`523`	`523`	`const char* i1 = args[1];`
`@@ -532,11 +532,17 @@ void BinaryUFunc(char** args, npy_intp* dimensions, npy_intp* steps,`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`
	`535`	`+// Numpy changed const-ness of PyUFuncGenericFunction, provide overload.`
`535`	`536`	`template <typename Functor>`
`536`	`537`	`void CompareUFunc(char** args, npy_intp* dimensions, npy_intp* steps,`
`537`	`538`	`void* data) {`
`538`	`539`	`BinaryUFunc<bfloat16, npy_bool, Functor>(args, dimensions, steps, data);`
`539`	`540`	`}`
	`541`	`+template <typename Functor>`
	`542`	`+void CompareUFunc(char** args, const npy_intp* dimensions,`
	`543`	`+ const npy_intp* steps, void* data) {`
	`544`	`+ BinaryUFunc<bfloat16, npy_bool, Functor>(args, dimensions, steps, data);`
	`545`	`+}`
`540`	`546`
`541`	`547`	`struct Bfloat16EqFunctor {`
`542`	`548`	`npy_bool operator()(bfloat16 a, bfloat16 b) { return a == b; }`