diff options
author | Yifei Feng <yifeif@google.com> | 2017-11-22 00:39:22 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-22 00:42:30 -0800 |
commit | e70c00950d295c519fd9c7f8b12e13a3c5aaf710 (patch) | |
tree | ee1210f8810e0b0fec9346f762e854b371899919 /tensorflow/go/tensor.go | |
parent | ad7eeec1cc06d7fdba6ee404f03a35fab9cd3e6a (diff) |
Automated g4 rollback of changelist 176615107
PiperOrigin-RevId: 176622438
Diffstat (limited to 'tensorflow/go/tensor.go')
-rw-r--r-- | tensorflow/go/tensor.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tensorflow/go/tensor.go b/tensorflow/go/tensor.go index 1326a95278..36a74c0081 100644 --- a/tensorflow/go/tensor.go +++ b/tensorflow/go/tensor.go @@ -101,7 +101,7 @@ func NewTensor(value interface{}) (*Tensor, error) { return nil, bug("NewTensor incorrectly calculated the size of a tensor with type %v and shape %v as %v bytes instead of %v", dataType, shape, nbytes, buf.Len()) } } else { - e := stringEncoder{offsets: buf, data: raw[nflattened*8:], status: newStatus()} + e := stringEncoder{offsets: buf, data: raw[nflattened*8 : len(raw)], status: newStatus()} if err := e.encode(reflect.ValueOf(value), shape); err != nil { return nil, err } @@ -207,9 +207,6 @@ func (t *Tensor) WriteContentsTo(w io.Writer) (int64, error) { func tensorData(c *C.TF_Tensor) []byte { // See: https://github.com/golang/go/wiki/cgo#turning-c-arrays-into-go-slices cbytes := C.TF_TensorData(c) - if cbytes == nil { - return nil - } length := int(C.TF_TensorByteSize(c)) slice := (*[1 << 30]byte)(unsafe.Pointer(cbytes))[:length:length] return slice @@ -313,7 +310,7 @@ func encodeTensor(w *bytes.Buffer, v reflect.Value, shape []int64) error { if err := w.WriteByte(b); err != nil { return err } - case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128: + case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint8, reflect.Uint16, reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128: if err := binary.Write(w, nativeEndian, v.Interface()); err != nil { return err } @@ -352,7 +349,7 @@ func decodeTensor(r *bytes.Reader, shape []int64, typ reflect.Type, ptr reflect. return err } ptr.Elem().SetBool(b == 1) - case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128: + case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint8, reflect.Uint16, reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128: if err := binary.Read(r, nativeEndian, ptr.Interface()); err != nil { return err } |