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 maxout operator. #5571

Merged
merged 31 commits into from
Nov 20, 2017
Merged

Add maxout operator. #5571

merged 31 commits into from
Nov 20, 2017

Commits on Nov 11, 2017

  1. this for maxout op new add

    wanghaox committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    4a428c8 View commit details
    Browse the repository at this point in the history

  2. this for maxout op new add

    wanghaox committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    058bdd3 View commit details
    Browse the repository at this point in the history

  3. resolve conflicts

    wanghaox committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    784fd82 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. Merge branch 'develop' into my_maxout_op

    @sweetsky0901
    sweetsky0901 committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    6c7e136 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into my_maxout_op

    @sweetsky0901
    sweetsky0901 committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    fe1e16b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    ab9c71d View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2017

  1. modify for maxoutop code review

    wanghaox committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    bd773b9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    494edc6 View commit details
    Browse the repository at this point in the history

  3. merge cmakelist

    wanghaox committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    bb1be5d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    9954496 View commit details
    Browse the repository at this point in the history

  5. del a err comments

    wanghaox committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    f57cd1e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    f319fb1 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2017

  1. maxout code review 2nd

    wanghaox committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    8d9babf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    3ef776e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2017

  1. update maxoutop for code review 3

    wanghaox committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    5802880 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    63f8c5f View commit details
    Browse the repository at this point in the history

  3. add test_maxout_op framework to fluis

    wanghaox committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    a6a01c1 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2017

  1. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    4c113cc View commit details
    Browse the repository at this point in the history

  2. modify for add a space in maxout op

    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    25d76bc View commit details
    Browse the repository at this point in the history

  3. del framework test_maxout_op

    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    2d7a652 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    13d39ea View commit details
    Browse the repository at this point in the history

  5. add a space + *

    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    c645d06 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    52f2366 View commit details
    Browse the repository at this point in the history

  7. for code review 4

    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    76fc1a8 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    wanghaox committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    6ac4237 View commit details
    Browse the repository at this point in the history

  9. rename back

    @sweetsky0901
    sweetsky0901 authored and sweetsky0901 committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    4e5c989 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    sweetsky0901 committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    350cc61 View commit details
    Browse the repository at this point in the history

  11. for code review 5

    sweetsky0901 committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    3fbff1e View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into… 

    … my_maxout_op
    sweetsky0901 committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    95cbbd7 View commit details
    Browse the repository at this point in the history

  13. for code review 6

    sweetsky0901 committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    04fd989 View commit details
    Browse the repository at this point in the history

  14. del num_channels

    sweetsky0901 committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    9cb2ff6 View commit details
    Browse the repository at this point in the history