Simplified error status conversion for backwards compatibility with TF 2.10.

PiperOrigin-RevId: 472724609
Change-Id: I9b6be102add6fc82cc8b7c7fcf2f2cb16219e1ca

Author: Johannes Ballé

tensorflow_compression/cc/kernels/run_length_gamma_kernels.cc

@@ -29,7 +29,6 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/tensor_types.h"
-#include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/status.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow_compression/cc/lib/bit_coder.h"
@@ -38,7 +37,6 @@ namespace tensorflow_compression {
 namespace {
 namespace errors = tensorflow::errors;
 using tensorflow::DEVICE_CPU;
-using tensorflow::FromAbslStatus;
 using tensorflow::OpKernel;
 using tensorflow::OpKernelConstruction;
 using tensorflow::OpKernelContext;
@@ -48,6 +46,13 @@ using tensorflow::TensorShape;
 using tensorflow::TensorShapeUtils;
 using tensorflow::tstring;
 
+#define OP_REQUIRES_OK_ABSL(context, status) \
+  {                                                                    \
+    auto s = (status);                                                 \
+    OP_REQUIRES(context, s.ok(), tensorflow::Status(                   \
+        static_cast<tensorflow::error::Code>(s.code()), s.message())); \
+  }
+
 class RunLengthGammaEncodeOp : public OpKernel {
  public:
   explicit RunLengthGammaEncodeOp(OpKernelConstruction* context)
@@ -142,7 +147,7 @@ class RunLengthGammaDecodeOp : public OpKernel {
     for (int64_t i = 0; i < data.size(); i++) {
       // Get number of zeros.
       auto num_zeros = dec.ReadGamma();
-      OP_REQUIRES(context, num_zeros.ok(), FromAbslStatus(num_zeros.status()));
+      OP_REQUIRES_OK_ABSL(context, num_zeros.status());
 
       // Advance the index to the next non-zero element.
       i += *num_zeros - 1;
@@ -157,11 +162,11 @@ class RunLengthGammaDecodeOp : public OpKernel {
 
       // Get sign of value.
       auto positive = dec.ReadOneBit();
-      OP_REQUIRES(context, positive.ok(), FromAbslStatus(positive.status()));
+      OP_REQUIRES_OK_ABSL(context, positive.status());
 
       // Get magnitude.
       auto magnitude = dec.ReadGamma();
-      OP_REQUIRES(context, magnitude.ok(), FromAbslStatus(magnitude.status()));
+      OP_REQUIRES_OK_ABSL(context, magnitude.status());
 
       // Write value to data tensor element at index.
       data(i) = *positive ? *magnitude : -*magnitude;
@@ -172,5 +177,7 @@ class RunLengthGammaDecodeOp : public OpKernel {
 REGISTER_KERNEL_BUILDER(Name("RunLengthGammaDecode").Device(DEVICE_CPU),
                         RunLengthGammaDecodeOp);
 
+#undef OP_REQUIRES_OK_ABSL
+
 }  // namespace
 }  // namespace tensorflow_compression