projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8cfd587
)
Revert "call __signbit for CUDA >= 6.5 implementation" -- doesn't
author
Jeff Donahue
<jeff.donahue@gmail.com>
Mon, 8 Sep 2014 09:02:31 +0000
(11:02 +0200)
committer
Jeff Donahue
<jeff.donahue@gmail.com>
Mon, 8 Sep 2014 09:02:31 +0000
(11:02 +0200)
compile on OSX w/ CUDA 6.5
This reverts commit
8819f5953b903ec8b48e541271737e89a2cd24e6
.
src/caffe/util/math_functions.cu
patch
|
blob
|
history
diff --git
a/src/caffe/util/math_functions.cu
b/src/caffe/util/math_functions.cu
index
176da93
..
4ae4bba
100644
(file)
--- a/
src/caffe/util/math_functions.cu
+++ b/
src/caffe/util/math_functions.cu
@@
-329,12
+329,7
@@
void caffe_gpu_powx<double>(const int N, const double* a,
DEFINE_AND_INSTANTIATE_GPU_UNARY_FUNC(sign, y[index] = (Dtype(0) < x[index])
- (x[index] < Dtype(0)));
-#if CUDA_VERSION >= 6050
-// __signbit to pick up the CUDA function.
-DEFINE_AND_INSTANTIATE_GPU_UNARY_FUNC(sgnbit, y[index] = __signbit(x[index]));
-#else
DEFINE_AND_INSTANTIATE_GPU_UNARY_FUNC(sgnbit, y[index] = signbit(x[index]));
-#endif
__global__ void popc_kernel(const int n, const float* a,
const float* b, uint8_t* y) {