Skip to content

Commit 8fcb4ab

Browse files
author
liuyu
committed
fix compilor bug
1 parent 92a55d1 commit 8fcb4ab

File tree

5 files changed

+7261
-3
lines changed

5 files changed

+7261
-3
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ifneq ($(CPU_ONLY), 1)
178178
LIBRARIES := cudart cublas curand
179179
endif
180180

181-
LIBRARIES += glog gflags protobuf boost_system boost_filesystem m hdf5_hl hdf5
181+
LIBRARIES += glog gflags protobuf boost_system m hdf5_hl hdf5
182182

183183
# handle IO dependencies
184184
USE_LEVELDB ?= 1
@@ -405,10 +405,10 @@ COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
405405
CXXFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS)
406406
NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
407407
# mex may invoke an older gcc that is too liberal with -Wuninitalized
408-
MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
408+
MATLAB_CXXFLAGS := $(CXXFLAGS) -fopenmp -Wno-uninitialized
409409
# required for compiling with support for mxGPUArray
410410
MATLAB_INCLUDE := -I$(MATLAB_DIR)/toolbox/distcomp/gpu/extern/include
411-
MATLAB_LIBS := -lmwgpu
411+
MATLAB_LIBS := -lgomp -lmwgpu
412412
LINKFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS)
413413

414414
USE_PKG_CONFIG ?= 0

matlab/debug.m

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
caffe.init_log('log/log')
2+
t = caffe.get_solver('solver_80k110k_lr1_3.prototxt', 0:3);
3+
t.step(1);
4+
fprintf('done\n');

matlab/solver_80k110k_lr1_3.prototxt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
net: "train_val.prototxt"
2+
base_lr: 0.001
3+
lr_policy: "step"
4+
gamma: 0.1
5+
stepsize: 80000
6+
display: 20
7+
max_iter: 110000
8+
momentum: 0.9
9+
weight_decay: 0.0005
10+
# We disable standard caffe solver snapshotting and implement our own snapshot
11+
snapshot: 0
12+
#debug_info: true
13+

0 commit comments

Comments
 (0)