Merge pull request #961 from jeffdonahue/gpu-flag-overrides-solver-mode
authorJeff Donahue <jeff.donahue@gmail.com>
Thu, 21 Aug 2014 21:35:23 +0000 (14:35 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Thu, 21 Aug 2014 21:35:23 +0000 (14:35 -0700)
If specified, --gpu flag overrides SolverParameter solver_mode.


Trivial merge