diff options
| author |  Vijay Vasudevan <vrv@google.com> | 2015-11-12 11:27:00 -0800 |
|---|---|---|
| committer | Vijay Vasudevan <vrv@google.com> | 2015-11-12 11:27:00 -0800 |
| commit | 4dffee7f62d81ec9173aba1b0ef6b96e47f8037c (patch) | |
| tree | 4b5c04b37afe45fdc5f1729252514a2770fbf1ab /tensorflow/core/kernels/slice_op.cc | |
| parent | f2102f4e2c1c87f1d1bf9ab856a2849c54478760 (diff) | |
TensorFlow: Minor updates to docs, BUILD, GPU config / perf, etc.
Changes:
- Updates to op documentation and index by Josh
- More changes to BUILD files for python 3 support by @girving
- Fix to Eigen to use DenseIndex everywhere by @jiayq
- Enable configuration for cuda compute capability by @zheng-xq,
including updates to docs.
- Route aggregation method through optimizer by schuster
- Updates to install instructions for bazel 0.1.1.
Base CL: 107702099
Diffstat (limited to 'tensorflow/core/kernels/slice_op.cc')
| -rw-r--r-- | tensorflow/core/kernels/slice_op.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tensorflow/core/kernels/slice_op.cc b/tensorflow/core/kernels/slice_op.cc index 3477266d5d..7e55149cd1 100644 --- a/tensorflow/core/kernels/slice_op.cc +++ b/tensorflow/core/kernels/slice_op.cc @@ -171,8 +171,8 @@ class SliceOp : public OpKernel { template <int NDIM> void HandleCase(OpKernelContext* context, const gtl::ArraySlice<int64>& begin, const gtl::ArraySlice<int64>& size, Tensor* result) { - Eigen::DSizes<ptrdiff_t, NDIM> indices; - Eigen::DSizes<ptrdiff_t, NDIM> sizes; + Eigen::DSizes<Eigen::DenseIndex, NDIM> indices; + Eigen::DSizes<Eigen::DenseIndex, NDIM> sizes; for (int i = 0; i < NDIM; ++i) { indices[i] = begin[i]; sizes[i] = size[i]; @@ -205,8 +205,8 @@ namespace functor { void Slice<GPUDevice, T, NDIM>::operator()( \ const GPUDevice& d, typename TTypes<T, NDIM>::Tensor output, \ typename TTypes<T, NDIM>::ConstTensor input, \ - const Eigen::DSizes<ptrdiff_t, NDIM>& indices, \ - const Eigen::DSizes<ptrdiff_t, NDIM>& sizes); \ + const Eigen::DSizes<Eigen::DenseIndex, NDIM>& indices, \ + const Eigen::DSizes<Eigen::DenseIndex, NDIM>& sizes); \ extern template struct Slice<GPUDevice, T, NDIM>; #define DECLARE_FOR_N(T) \ |