Skip to content

Commit f9a0dba

Browse files
typhoonzerotyphoonzero
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into cudnn_conv_op
2 parents e83c379 + cce682f commit f9a0dba

File tree

175 files changed

+7420
-2274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+7420
-2274
lines changed

‎benchmark/paddle/image/provider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ def initHook(settings, height, width, color, num_class, **kwargs):
2222
def process(settings, file_list):
2323
for i in xrange(1024):
2424
img = np.random.rand(1, settings.data_size).reshape(-1, 1).flatten()
25-
lab = random.randint(0, settings.num_class)
25+
lab = random.randint(0, settings.num_class - 1)
2626
yield img.astype('float32'), int(lab)

‎benchmark/paddle/image/run_mkldnn.sh‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
set -e
2+
3+
unset OMP_NUM_THREADS MKL_NUM_THREADS
4+
export OMP_DYNAMIC="FALSE"
5+
export KMP_AFFINITY="granularity=fine,compact,0,0"
6+
7+
function train() {
8+
topology=$1
9+
bs=$2
10+
use_mkldnn=$3
11+
if [ $3 == "True" ]; then
12+
thread=1
13+
log="logs/${topology}-mkldnn-${bs}.log"
14+
elif [ $3 == "False" ]; then
15+
thread=`nproc`
16+
# each trainer_count use only 1 core to avoid conflict
17+
export OMP_NUM_THREADS=1
18+
export MKL_NUM_THREADS=1
19+
log="logs/${topology}-${thread}mklml-${bs}.log"
20+
else
21+
echo "Wrong input $3, use True or False."
22+
exit 0
23+
fi
24+
args="batch_size=${bs}"
25+
config="${topology}.py"
26+
paddle train --job=time \
27+
--config=$config \
28+
--use_mkldnn=$use_mkldnn \
29+
--use_gpu=False \
30+
--trainer_count=$thread \
31+
--log_period=10 \
32+
--test_period=100 \
33+
--config_args=$args \
34+
2>&1 | tee ${log}
35+
}
36+
37+
if [ ! -d "train.list" ]; then
38+
echo " " > train.list
39+
fi
40+
if [ ! -d "logs" ]; then
41+
mkdir logs
42+
fi
43+
44+
#========== mkldnn ==========#
45+
train vgg 64 True
46+
train vgg 128 True
47+
train vgg 256 True
48+
49+
#========== mklml ===========#
50+
train vgg 64 False
51+
train vgg 128 False
52+
train vgg 256 False

‎benchmark/paddle/image/vgg.py‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
#!/usr/bin/env python
2+
from paddle.trainer_config_helpers import *
3+
4+
height = 224
5+
width = 224
6+
num_class = 1000
7+
batch_size = get_config_arg('batch_size', int, 64)
8+
layer_num = get_config_arg('layer_num', int, 19)
9+
10+
args = {'height': height, 'width': width, 'color': True, 'num_class': num_class}
11+
define_py_data_sources2(
12+
"train.list", None, module="provider", obj="process", args=args)
13+
14+
settings(
15+
batch_size=batch_size,
16+
learning_rate=0.01 / batch_size,
17+
learning_method=MomentumOptimizer(0.9),
18+
regularization=L2Regularization(0.0005 * batch_size))
19+
20+
img = data_layer(name='image', size=height * width * 3)
21+
22+
23+
def vgg_network(vgg_num=3):
24+
tmp = img_conv_group(
25+
input=img,
26+
num_channels=3,
27+
conv_padding=1,
28+
conv_num_filter=[64, 64],
29+
conv_filter_size=3,
30+
conv_act=ReluActivation(),
31+
pool_size=2,
32+
pool_stride=2,
33+
pool_type=MaxPooling())
34+
35+
tmp = img_conv_group(
36+
input=tmp,
37+
conv_num_filter=[128, 128],
38+
conv_padding=1,
39+
conv_filter_size=3,
40+
conv_act=ReluActivation(),
41+
pool_stride=2,
42+
pool_type=MaxPooling(),
43+
pool_size=2)
44+
45+
channels = []
46+
for i in range(vgg_num):
47+
channels.append(256)
48+
tmp = img_conv_group(
49+
input=tmp,
50+
conv_num_filter=channels,
51+
conv_padding=1,
52+
conv_filter_size=3,
53+
conv_act=ReluActivation(),
54+
pool_stride=2,
55+
pool_type=MaxPooling(),
56+
pool_size=2)
57+
channels = []
58+
for i in range(vgg_num):
59+
channels.append(512)
60+
tmp = img_conv_group(
61+
input=tmp,
62+
conv_num_filter=channels,
63+
conv_padding=1,
64+
conv_filter_size=3,
65+
conv_act=ReluActivation(),
66+
pool_stride=2,
67+
pool_type=MaxPooling(),
68+
pool_size=2)
69+
tmp = img_conv_group(
70+
input=tmp,
71+
conv_num_filter=channels,
72+
conv_padding=1,
73+
conv_filter_size=3,
74+
conv_act=ReluActivation(),
75+
pool_stride=2,
76+
pool_type=MaxPooling(),
77+
pool_size=2)
78+
79+
tmp = fc_layer(
80+
input=tmp,
81+
size=4096,
82+
act=ReluActivation(),
83+
layer_attr=ExtraAttr(drop_rate=0.5))
84+
85+
tmp = fc_layer(
86+
input=tmp,
87+
size=4096,
88+
act=ReluActivation(),
89+
layer_attr=ExtraAttr(drop_rate=0.5))
90+
91+
return fc_layer(input=tmp, size=num_class, act=SoftmaxActivation())
92+
93+
94+
if layer_num == 16:
95+
vgg = vgg_network(3)
96+
elif layer_num == 19:
97+
vgg = vgg_network(4)
98+
else:
99+
print("Wrong layer number.")
100+
101+
lab = data_layer('label', num_class)
102+
loss = cross_entropy(input=vgg, label=lab)
103+
outputs(loss)

‎cmake/generic.cmake‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,22 @@ function(merge_static_libs TARGET_NAME)
106106
endforeach()
107107
list(REMOVE_DUPLICATES libs_deps)
108108

109-
if(APPLE) # Use OSX's libtool to merge archives
110-
# To produce a library we need at least one source file.
111-
# It is created by add_custom_command below and will helps
112-
# also help to track dependencies.
113-
set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}_dummy.c)
109+
# To produce a library we need at least one source file.
110+
# It is created by add_custom_command below and will helps
111+
# also help to track dependencies.
112+
set(target_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}_dummy.c)
114113

114+
if(APPLE) # Use OSX's libtool to merge archives
115115
# Make the generated dummy source file depended on all static input
116116
# libs. If input lib changes,the source file is touched
117117
# which causes the desired effect (relink).
118-
add_custom_command(OUTPUT ${dummyfile}
119-
COMMAND ${CMAKE_COMMAND} -E touch ${dummyfile}
118+
add_custom_command(OUTPUT ${target_SRCS}
119+
COMMAND ${CMAKE_COMMAND} -E touch ${target_SRCS}
120120
DEPENDS ${libs})
121121

122122
# Generate dummy staic lib
123-
file(WRITE ${dummyfile} "const char * dummy = \"${dummyfile}\";")
124-
add_library(${TARGET_NAME} STATIC ${dummyfile})
123+
file(WRITE ${target_SRCS} "const char *dummy = \"${target_SRCS}\";")
124+
add_library(${TARGET_NAME} STATIC ${target_SRCS})
125125
target_link_libraries(${TARGET_NAME} ${libs_deps})
126126

127127
foreach(lib ${libs})
@@ -130,43 +130,47 @@ function(merge_static_libs TARGET_NAME)
130130
endforeach()
131131
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
132132
COMMAND rm "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET_NAME}.a"
133-
COMMAND /usr/bin/libtool -static -o "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET_NAME}.a" ${libfiles})
133+
COMMAND /usr/bin/libtool -static -o "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET_NAME}.a" ${libfiles}
134+
)
134135
else() # general UNIX: use "ar" to extract objects and re-add to a common lib
136+
set(target_DIR ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}.dir)
137+
135138
foreach(lib ${libs})
136-
set(objlistfile ${lib}.objlist) # list of objects in the input library
137-
set(objdir ${lib}.objdir)
139+
set(objlistfile ${target_DIR}/${lib}.objlist) # list of objects in the input library
140+
set(objdir ${target_DIR}/${lib}.objdir)
138141

139142
add_custom_command(OUTPUT ${objdir}
140143
COMMAND ${CMAKE_COMMAND} -E make_directory ${objdir}
141144
DEPENDS ${lib})
142145

143146
add_custom_command(OUTPUT ${objlistfile}
144147
COMMAND ${CMAKE_AR} -x "$<TARGET_FILE:${lib}>"
145-
COMMAND ${CMAKE_AR} -t "$<TARGET_FILE:${lib}>" > ../${objlistfile}
148+
COMMAND ${CMAKE_AR} -t "$<TARGET_FILE:${lib}>" > ${objlistfile}
146149
DEPENDS ${lib} ${objdir}
147150
WORKING_DIRECTORY ${objdir})
148151

149-
# Empty dummy source file that goes into merged library
150-
set(mergebase ${lib}.mergebase.c)
151-
add_custom_command(OUTPUT ${mergebase}
152-
COMMAND ${CMAKE_COMMAND} -E touch ${mergebase}
153-
DEPENDS ${objlistfile})
154-
155-
list(APPEND mergebases "${mergebase}")
152+
list(APPEND target_OBJS "${objlistfile}")
156153
endforeach()
157154

158-
add_library(${TARGET_NAME} STATIC ${mergebases})
155+
# Make the generated dummy source file depended on all static input
156+
# libs. If input lib changes,the source file is touched
157+
# which causes the desired effect (relink).
158+
add_custom_command(OUTPUT ${target_SRCS}
159+
COMMAND ${CMAKE_COMMAND} -E touch ${target_SRCS}
160+
DEPENDS ${libs} ${target_OBJS})
161+
162+
# Generate dummy staic lib
163+
file(WRITE ${target_SRCS} "const char *dummy = \"${target_SRCS}\";")
164+
add_library(${TARGET_NAME} STATIC ${target_SRCS})
159165
target_link_libraries(${TARGET_NAME} ${libs_deps})
160166

161167
# Get the file name of the generated library
162-
set(outlibfile "$<TARGET_FILE:${TARGET_NAME}>")
168+
set(target_LIBNAME "$<TARGET_FILE:${TARGET_NAME}>")
163169

164-
foreach(lib ${libs})
165-
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
166-
COMMAND ${CMAKE_AR} cr ${outlibfile} *.o
167-
COMMAND ${CMAKE_RANLIB} ${outlibfile}
168-
WORKING_DIRECTORY ${lib}.objdir)
169-
endforeach()
170+
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
171+
COMMAND ${CMAKE_AR} crs ${target_LIBNAME} `find ${target_DIR} -name '*.o'`
172+
COMMAND ${CMAKE_RANLIB} ${target_LIBNAME}
173+
WORKING_DIRECTORY ${target_DIR})
170174
endif()
171175
endfunction(merge_static_libs)
172176

@@ -196,7 +200,7 @@ function(cc_library TARGET_NAME)
196200
add_style_check_target(${TARGET_NAME} ${cc_library_SRCS} ${cc_library_HEADERS})
197201

198202
else(cc_library_SRCS)
199-
if (cc_library_DEPS)
203+
if(cc_library_DEPS)
200204
merge_static_libs(${TARGET_NAME} ${cc_library_DEPS})
201205
else()
202206
message(FATAL "Please specify source file or library in cc_library.")
@@ -249,7 +253,7 @@ function(nv_library TARGET_NAME)
249253
foreach(source_file ${nv_library_SRCS})
250254
string(REGEX REPLACE "\\.[^.]*$" "" source ${source_file})
251255
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${source}.h)
252-
list(APPEND cc_library_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${source}.h)
256+
list(APPEND nv_library_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${source}.h)
253257
endif()
254258
endforeach()
255259
add_style_check_target(${TARGET_NAME} ${nv_library_SRCS} ${nv_library_HEADERS})

‎cmake/util.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ function(link_paddle_exe TARGET_NAME)
9797
target_link_libraries(${TARGET_NAME} log)
9898
endif(ANDROID)
9999

100+
if(WITH_MKLDNN AND WITH_MKLML AND MKLDNN_IOMP_DIR)
101+
target_link_libraries(${TARGET_NAME} "-L${MKLDNN_IOMP_DIR} -liomp5 -Wl,--as-needed")
102+
endif()
103+
100104
add_dependencies(${TARGET_NAME} ${external_project_dependencies})
101105
endfunction()
102106

0 commit comments

Comments
 (0)