Merge commit 'ed6f5d7038f0e3873c2ed6add2ede7c9ab38e1ea'

soumith · soumith · commit c674923bcc38 · 2017-07-13T19:24:22.000-04:00
diff --git a/torch/lib/THC/THCSortUtils.cuh b/torch/lib/THC/THCSortUtils.cuh
@@ -134,6 +134,7 @@ __device__ inline void bitonicSortKeys(K keys[Power2SortSize],
 template <typename K, typename V,
           int KeyDims, int ValueDims,
           typename Comparator, typename IndexType, int Power2SortSize>
+__launch_bounds__(1024)
 __global__ void
 bitonicSortKVInPlace(TensorInfo<K, IndexType> keys,
                      IndexType keySlices,
