Skip to content

Add more convenience math functions and all tests pass#201

Merged
shelhamer merged 9 commits intoBVLC:devfrom
kloudkl:more_math_functions
Mar 24, 2014
Merged

Add more convenience math functions and all tests pass#201
shelhamer merged 9 commits intoBVLC:devfrom
kloudkl:more_math_functions

Conversation

@kloudkl
Copy link
Contributor

@kloudkl kloudkl commented Mar 11, 2014

This PR fixed the build error in #159 and removed the code that might conflict with #161.

Two lessons learned:

  1. Make sure to test again every time after rebasing.
  2. Keep the codes in the branch that depends on it and nowhere else.

@shelhamer
Copy link
Member

Thanks for the fixed PR! Checked that this builds and that tests pass.

Please run make lint and resolve the style complaints in math_functions.hpp, test_math_functions.cpp, and math_functions.cu.

@kloudkl
Copy link
Contributor Author

kloudkl commented Mar 18, 2014

All the lint errors except two about the CUDA kernel launch operator (linter wrongly takes <<< in macro definition as <<) have been fixed.

Copy link
Member

Choose a reason for hiding this comment

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

Add // NOLINT_NEXT_LINE(whitespace/operators) to the line above to grant an exception for the CUDA <<< and >>>. See https://github.com/BVLC/caffe/blob/dev/src/caffe/layers/pooling_layer.cu#L149 for an example.

@shelhamer
Copy link
Member

I plan to merge this soon after #165, which is first since it is an older effort and broadens compatibility. This PR will need to be rebased then (it is not a clean merge now, either).

@kloudkl
Copy link
Contributor Author

kloudkl commented Mar 22, 2014

Yes, I am dealing with the trouble of a bunch of merge conflicts with dev.

@kloudkl
Copy link
Contributor Author

kloudkl commented Mar 23, 2014

Rebased, cpplinted and tested. Ready for merging.

shelhamer added a commit that referenced this pull request Mar 24, 2014
Add more convenience math functions and all tests pass
@shelhamer shelhamer merged commit 91483ae into BVLC:dev Mar 24, 2014
@shelhamer
Copy link
Member

Thanks @kloudkl!

@kloudkl kloudkl deleted the more_math_functions branch March 25, 2014 00:04
@shelhamer shelhamer mentioned this pull request May 20, 2014
mitmul pushed a commit to mitmul/caffe that referenced this pull request Sep 30, 2014
Add more convenience math functions and all tests pass
lukeyeager pushed a commit to lukeyeager/caffe that referenced this pull request Aug 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments