diff options
| author | Trevor Killeen <killeentm@gmail.com> | 2016-09-28 17:58:56 +0300 |
|---|---|---|
| committer | Trevor Killeen <killeentm@gmail.com> | 2016-10-07 21:50:27 +0300 |
| commit | b490d8d22ae5cd900001346239a33ba6cde1f3e0 (patch) | |
| tree | b9191c7ec330e0e8daae9705b0ece7ae5200812c /lib/THC | |
| parent | c1dcfb6a54febeb6a45b9066553b621070b55c85 (diff) | |
[cutorch refactor] move std function into generic
Diffstat (limited to 'lib/THC')
| -rw-r--r-- | lib/THC/THCNumerics.cuh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/THC/THCNumerics.cuh b/lib/THC/THCNumerics.cuh index 543a544..7513764 100644 --- a/lib/THC/THCNumerics.cuh +++ b/lib/THC/THCNumerics.cuh @@ -527,7 +527,10 @@ struct THCNumerics<float> { static inline __host__ __device__ float div (float a, float b) { return a / b; } static inline __host__ __device__ float mul (float a, float b) { return a * b; } static inline __host__ __device__ float sub (float a, float b) { return a - b; } +<<<<<<< 428317be4d5d9423ccb6ac2701c55baaffb8737b static inline __host__ __device__ float pow (float a, float b) { return powf(a, b); } +======= +>>>>>>> [cutorch refactor] move std function into generic }; template <> @@ -570,7 +573,10 @@ struct THCNumerics<double> { static inline __host__ __device__ double div (double a, double b) { return a / b; } static inline __host__ __device__ double mul (double a, double b) { return a * b; } static inline __host__ __device__ double sub (double a, double b) { return a - b; } +<<<<<<< 428317be4d5d9423ccb6ac2701c55baaffb8737b static inline __host__ __device__ double pow (double a, double b) { return pow(a, b); } +======= +>>>>>>> [cutorch refactor] move std function into generic }; /// `half` has some type conversion issues associated with it, since it |