Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add option WITH_MKL #5714

Merged
merged 4 commits into from
Nov 17, 2017
Merged

add option WITH_MKL #5714

merged 4 commits into from
Nov 17, 2017

Conversation

tensor-tang
Copy link
Contributor

@tensor-tang tensor-tang commented Nov 16, 2017 •
edited
Loading

fix #5725
Expose only one main option WITH_MKL to user, and hide the WITH_MKLML and WITH_MKLDNN.

@tensor-tang tensor-tang requested a review from luotao1 November 16, 2017 15:21
@tensor-tang
Copy link
Contributor Author

tensor-tang commented Nov 16, 2017 •
edited
Loading

[16:51:46] : [Step 1/1] [ 21%] Built target cblas
[16:51:46] : [Step 1/1] Scanning dependencies of target math_function
[16:51:46] : [Step 1/1] [ 21%] Building CXX object paddle/operators/math/CMakeFiles/math_function.dir/im2col.cc.o
[16:51:46] : [Step 1/1] [ 21%] Building CXX object paddle/operators/math/CMakeFiles/math_function.dir/math_function.cc.o
[16:51:47]W: [Step 1/1] In file included from /paddle/paddle/operators/math/math_function.cc:16:0:
[16:51:47]W: [Step 1/1] /paddle/paddle/framework/data_type.h:17:43: fatal error: paddle/framework/framework.pb.h: No such file or directory
[16:51:47]W: [Step 1/1] compilation terminated.
[16:51:47] : [Step 1/1] paddle/operators/math/CMakeFiles/math_function.dir/build.make:62: recipe for target 'paddle/operators/math/CMakeFiles/math_function.dir/math_function.cc.o' failed
[16:51:47]W: [Step 1/1] make[2]: *** [paddle/operators/math/CMakeFiles/math_function.dir/math_function.cc.o] Error 1
[16:51:47]W: [Step 1/1] make[2]: *** Waiting for unfinished jobs....

貌似出现了别的error，我重启了几遍还是存在。

@luotao1
Copy link
Contributor

luotao1 commented Nov 17, 2017

The error is duplicated with #5698

luotao1
luotao1 approved these changes Nov 17, 2017
View reviewed changes
Copy link
Contributor

@luotao1 luotao1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 文档有一处typo，可以和#5547 (review) 一起修改

doc/design/mkldnn/README.MD
@@ -36,13 +36,13 @@ Figure 1. PaddlePaddle on IA.
我们把集成方案大致分为了如下几个方面。

### CMake
我们会在`CMakeLists.txt`中会添加`WITH_MKLDNN`的选项，当设置这个值为`ON`的时候会启用编译MKL-DNN功能。同时会自动开启OpenMP用于提高MKL-DNN的性能。
我们会在`CMakeLists.txt`中会给用户添加一个`WITH_MKL`的开关，他是负责`WITH_MKLML`和`WITH_MKLDNN`的总开关。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

他-》它

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的，thanks

@luotao1 luotao1 merged commit 3375e3e into PaddlePaddle:develop Nov 17, 2017
@tensor-tang tensor-tang deleted the refine branch November 17, 2017 06:49
@luotao1 luotao1 mentioned this pull request Nov 21, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luotao1 luotao1 luotao1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

unify WITH_MKLDNN and WITH_MKLML tobe WITH_MKL
2 participants
@tensor-tang @luotao1