OSSForks/tensorflow
1
0
Fork 0
mirror of https://github.com/zebrajr/tensorflow.git synced 2025-12-07 00:20:20 +01:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Remove unnecessary casts

Browse Source 
PiperOrigin-RevId: 157591439
This commit is contained in:
A. Unique TensorFlower 2017-05-31 08:51:50 -07:00 committed by TensorFlower Gardener
parent 5f8571a6bc
commit e96f1142fa
2 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
View File

@ -180,8 +180,8 @@ class SingleImageRandomDotStereogramsOp : public OpKernel {
// Init Min/Max to first value
if (normalize_max < normalize_min) // Autoscale if MIN>MAX
{
MaxValue = (double)*Z;
MinValue = (double)*Z;
MaxValue = *Z;
MinValue = *Z;
for (int y = 0; y < input_Yvalue; ++y)
for (int x = 0; x < input_Xvalue; ++x) {
@ -213,10 +213,7 @@ class SingleImageRandomDotStereogramsOp : public OpKernel {
//***************************************************************************
//***************************************************************************
double getZfromInputImage(const T* Z, int x, int y) {
double return_val;
return_val = (double)*(Z + input_Xvalue * y + x); // Get value
return return_val;
return *(Z + input_Xvalue * y + x);
}
//***************************************************************************
@ -271,31 +268,20 @@ class SingleImageRandomDotStereogramsOp : public OpKernel {
//***************************************************************************
double getZFromOutputPixel(int x, int y) {
double xofz, yofz, returnval;
// Convert pixel units to Z units, do this as "double"
xofz =
(double)input_Xvalue * (x - data_box_left) / ((double)data_box_width);
yofz =
(double)input_Yvalue * (y - data_box_top) / ((double)data_box_height);
double xofz = static_cast<double>(input_Xvalue) * (x - data_box_left) /
(static_cast<double>(data_box_width));
double yofz = static_cast<double>(input_Yvalue) * (y - data_box_top) /
(static_cast<double>(data_box_height));
if ((xofz < 0) || (yofz < 0) || (yofz >= input_Yvalue) ||
(xofz >= input_Xvalue)) { // Top of left side border hit or Right
// side or bottom border hit
// Send BORDER Z value
return (border_level);
(xofz >= input_Xvalue)) { // Top of left side border hit or Right
// side or bottom border hit,
// send BORDER Z value
return border_level;
} else {
return getZfromZbuffer(xofz, yofz);
}
{ // in data set Z interpolate if need
double gz;
gz = getZfromZbuffer(xofz, yofz);
returnval = gz;
}
return (returnval);
}
//***************************************************************************

15
tensorflow/core/kernels/cuda_solvers.cc
View File

@ -268,9 +268,8 @@ static inline Status GetrfBatchedImpl(
using CudaScalar = typename CUDAComplexT<Scalar>::type;
ScratchSpace<uint8> dev_a_dev_ptrs(context, sizeof(CudaScalar*) * batch_size,
/* on_host */ false);
if (!CopyHostToDevice(
context, (void*)dev_a_dev_ptrs.mutable_data() /* dest */,
(const void*)host_a_dev_ptrs /* source */, dev_a_dev_ptrs.bytes())) {
if (!CopyHostToDevice(context, dev_a_dev_ptrs.mutable_data() /* dest */,
host_a_dev_ptrs /* source */, dev_a_dev_ptrs.bytes())) {
return errors::Internal("GetrfBatched: failed to copy pointers to device");
}
TF_RETURN_IF_CUBLAS_ERROR(
@ -302,12 +301,10 @@ static inline Status GetriBatchedImpl(
/* on_host */ false);
ScratchSpace<uint8> dev_a_inv_dev_ptrs(
context, sizeof(CudaScalar*) * batch_size, /* on_host */ false);
if (!CopyHostToDevice(
context, (void*)dev_a_dev_ptrs.mutable_data() /* dest */,
(const void*)host_a_dev_ptrs /* source */, dev_a_dev_ptrs.bytes()) ||
!CopyHostToDevice(context, (void*)dev_a_inv_dev_ptrs.mutable_data(),
(const void*)host_a_inv_dev_ptrs,
dev_a_inv_dev_ptrs.bytes())) {
if (!CopyHostToDevice(context, dev_a_dev_ptrs.mutable_data() /* dest */,
host_a_dev_ptrs /* source */, dev_a_dev_ptrs.bytes()) ||
!CopyHostToDevice(context, dev_a_inv_dev_ptrs.mutable_data(),
host_a_inv_dev_ptrs, dev_a_inv_dev_ptrs.bytes())) {
return errors::Internal("GetriBatched: failed to copy pointers to device");
}
TF_RETURN_IF_CUBLAS_ERROR(