From c357810c2eed2f677c2a9b22416460a4bca14470 Mon Sep 17 00:00:00 2001 From: Adam Kosiorek Date: Wed, 23 Jul 2014 09:12:44 +0200 Subject: [PATCH] fixed lint issues --- src/caffe/test/test_caffe_main.cpp | 5 ++--- src/caffe/test/test_hdf5_output_layer.cpp | 3 ++- src/caffe/test/test_hdf5data_layer.cpp | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/caffe/test/test_caffe_main.cpp b/src/caffe/test/test_caffe_main.cpp index ad6e189..bff0c4e 100644 --- a/src/caffe/test/test_caffe_main.cpp +++ b/src/caffe/test/test_caffe_main.cpp @@ -27,9 +27,8 @@ int main(int argc, char** argv) { cudaSetDevice(device); cout << "Setting to use device " << device << endl; } else if (CUDA_TEST_DEVICE >= 0) { - - // Use the device assigned in build configuration; but with a lower priority - device = CUDA_TEST_DEVICE; + // Use the device assigned in build configuration; but with a lower priority + device = CUDA_TEST_DEVICE; } cudaGetDevice(&device); cout << "Current device id: " << device << endl; diff --git a/src/caffe/test/test_hdf5_output_layer.cpp b/src/caffe/test/test_hdf5_output_layer.cpp index f3ddfcd..b2a511d 100644 --- a/src/caffe/test/test_hdf5_output_layer.cpp +++ b/src/caffe/test/test_hdf5_output_layer.cpp @@ -23,7 +23,8 @@ class HDF5OutputLayerTest : public MultiDeviceTest { protected: HDF5OutputLayerTest() : output_file_name_(tmpnam(NULL)), - input_file_name_(CMAKE_SOURCE_DIR "caffe/test/test_data/sample_data.h5"), + input_file_name_( + CMAKE_SOURCE_DIR "caffe/test/test_data/sample_data.h5"), blob_data_(new Blob()), blob_label_(new Blob()), num_(5), diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index 1de8233..acca75b 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -31,8 +31,9 @@ class HDF5DataLayerTest : public MultiDeviceTest { blob_top_vec_.push_back(blob_top_label_); // Check out generate_sample_data.py in the same directory. - filename = new string(CMAKE_SOURCE_DIR "caffe/test/test_data/sample_data_list.txt" CMAKE_EXT); - LOG(INFO) << "Using sample HDF5 data file " << filename; + filename = new string( + CMAKE_SOURCE_DIR "caffe/test/test_data/sample_data_list.txt" CMAKE_EXT); + LOG(INFO)<< "Using sample HDF5 data file " << filename; } virtual ~HDF5DataLayerTest() { -- 2.7.4