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

"polish activation" #9740

Merged
merged 11 commits into from
Apr 20, 2018
Merged

"polish activation" #9740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e54f203
"move to a new PR"
dzhwinter Apr 16, 2018
877e2ae
"fix ci"
dzhwinter Apr 16, 2018
e08f701
Merge remote-tracking branch 'origin/develop' into memory/activation_…
dzhwinter Apr 16, 2018
b92b408
"fix ci"
dzhwinter Apr 16, 2018
626227e
"fix ci"
dzhwinter Apr 17, 2018
425a1e7
Merge remote-tracking branch 'origin/develop' into memory/activation_…
dzhwinter Apr 18, 2018
61cb4f2
"fix ci"
dzhwinter Apr 18, 2018
7a517dc
merge develop
dzhwinter Apr 18, 2018
9b8ca0c
"fix after merge"
dzhwinter Apr 18, 2018
1fc9fe7
merge develop
dzhwinter Apr 19, 2018
ba5ddb7
"rebase"
dzhwinter Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions paddle/fluid/operators/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,12 @@ function(op_library TARGET)

# pybind USE_OP
if (${pybind_flag} EQUAL 0)
# NOTE(*): activation use macro to regist the kernels, set use_op manually.
if(${TARGET} STREQUAL "activation")
Copy link
Contributor

Choose a reason for hiding this comment

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

Hopefully, we can remove this hard-coded "activation" and "relu" strings in the cmake files the future.

Add a TODO to clean up?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep. The CMakeLists in operators need a clean up, will file a PR do this later.

file(APPEND ${pybind_file} "USE_OP(relu);\n")
else()
file(APPEND ${pybind_file} "USE_OP(${TARGET});\n")
endif()
endif()
endfunction()

Expand Down
Loading