Skip to content

Commit

Permalink
fixed lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Kosiorek authored and jeffdonahue committed Aug 17, 2014
1 parent bf55cb9 commit c357810
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/caffe/test/test_caffe_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/caffe/test/test_hdf5_output_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ class HDF5OutputLayerTest : public MultiDeviceTest<TypeParam> {
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<Dtype>()),
blob_label_(new Blob<Dtype>()),
num_(5),
Expand Down
5 changes: 3 additions & 2 deletions src/caffe/test/test_hdf5data_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ class HDF5DataLayerTest : public MultiDeviceTest<TypeParam> {
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() {
Expand Down

0 comments on commit c357810

Please sign in to comment.