Merge pull request #153 from iotamudelta/bitonic

Correctly type cast everything.

Author: iotamudelta

aten/src/THC/generic/THCTensorSort.cu

@@ -56,21 +56,21 @@ THC_API void THCTensor_(sortKeyValueInplace)(THCState* state,
       bitonicSortKVInPlace<scalar_t, int64_t, A, -1, GTComp<scalar_t>, TYPE, SIZE> \
         <<<grid, block, 0, THCState_getCurrentStream(state)>>>(         \
           keyInfo,                                                      \
-          keySlices,                                                    \
-          (TYPE) keySliceSize,                                          \
-          (TYPE) keyInfo.strides[collapseKeyDim],                       \
+          static_cast<TYPE>(keySlices),                                 \
+          static_cast<TYPE>(keySliceSize),                              \
+          static_cast<TYPE>(keyInfo.strides[collapseKeyDim]),           \
           valueInfo,                                                    \
-          (TYPE) valueInfo.strides[collapseValueDim],                   \
-          GTComp<scalar_t>());                                              \
+          static_cast<TYPE>(valueInfo.strides[collapseValueDim]),       \
+          GTComp<scalar_t>());                                          \
     } else {                                                            \
       bitonicSortKVInPlace<scalar_t, int64_t, A, -1, LTComp<scalar_t>, TYPE, SIZE> \
         <<<grid, block, 0, THCState_getCurrentStream(state)>>>(         \
           keyInfo,                                                      \
-          keySlices,                                                    \
-          (TYPE) keySliceSize,                                          \
-          (TYPE) keyInfo.strides[collapseKeyDim],                       \
+          static_cast<TYPE>(keySlices),                                 \
+          static_cast<TYPE>(keySliceSize),                              \
+          static_cast<TYPE>(keyInfo.strides[collapseKeyDim]),           \
           valueInfo,                                                    \
-          (TYPE) valueInfo.strides[collapseValueDim],                   \
+          static_cast<TYPE>(valueInfo.strides[collapseValueDim]),       \
           LTComp<scalar_t>());                                              \
     }                                                                   \
   } while (0)