diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-06-26 09:10:54 -0700 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-06-26 09:10:54 -0700 |
| commit | 396f03a97defdb738bf314a660fd4a8e35a3edbc (patch) | |
| tree | 8486147132680692875f64e3bdbae05efe89f535 /src/caffe/common.cpp | |
| parent | c826e527e90398de0983d145a63796d7739df8b8 (diff) | |
| parent | 89fd7e333480d0eb4d78fb14dc6f435e76c5638c (diff) | |
| download | caffeonacl-396f03a97defdb738bf314a660fd4a8e35a3edbc.tar.gz caffeonacl-396f03a97defdb738bf314a660fd4a8e35a3edbc.tar.bz2 caffeonacl-396f03a97defdb738bf314a660fd4a8e35a3edbc.zip | |
Merge pull request #488 from longjon/wall-werror
Build with -Wall -Werror
Diffstat (limited to 'src/caffe/common.cpp')
| -rw-r--r-- | src/caffe/common.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/caffe/common.cpp b/src/caffe/common.cpp index 5a8300aa..631c8afd 100644 --- a/src/caffe/common.cpp +++ b/src/caffe/common.cpp @@ -22,9 +22,8 @@ int64_t cluster_seedgen(void) { Caffe::Caffe() - : mode_(Caffe::CPU), phase_(Caffe::TRAIN), cublas_handle_(NULL), - curand_generator_(NULL), - random_generator_() { + : cublas_handle_(NULL), curand_generator_(NULL), random_generator_(), + mode_(Caffe::CPU), phase_(Caffe::TRAIN) { // Try to create a cublas handler, and report an error if failed (but we will // keep the program running as one might just want to run CPU code). if (cublasCreate(&cublas_handle_) != CUBLAS_STATUS_SUCCESS) { @@ -162,8 +161,10 @@ const char* cublasGetErrorString(cublasStatus_t error) { return "CUBLAS_STATUS_EXECUTION_FAILED"; case CUBLAS_STATUS_INTERNAL_ERROR: return "CUBLAS_STATUS_INTERNAL_ERROR"; +#if CUDA_VERSION >= 6000 case CUBLAS_STATUS_NOT_SUPPORTED: return "CUBLAS_STATUS_NOT_SUPPORTED"; +#endif } return "Unknown cublas status"; } |