diff options
| author | Cyprien Noel <cyprien.noel@gmail.com> | 2017-03-13 15:15:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 15:15:42 -0700 |
| commit | 317d162acbe420c4b2d1faa77b5c18a3841c444c (patch) | |
| tree | 3d6f937cb50458a2e941d1cdcae2c51956b27b21 | |
| parent | e687a71fac81718d40d4e0e98d29eab34f784b5b (diff) | |
| parent | 1d3e6e4522a95faf954e775b23a2f907e66caf31 (diff) | |
| download | caffeonacl-317d162acbe420c4b2d1faa77b5c18a3841c444c.tar.gz caffeonacl-317d162acbe420c4b2d1faa77b5c18a3841c444c.tar.bz2 caffeonacl-317d162acbe420c4b2d1faa77b5c18a3841c444c.zip | |
Merge pull request #5393 from jfolz/master
Multi GPU training from Python can use any solver
| -rw-r--r-- | python/caffe/_caffe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp index 3589e476..be011699 100644 --- a/python/caffe/_caffe.cpp +++ b/python/caffe/_caffe.cpp @@ -288,7 +288,7 @@ void Solver_add_callback(Solver<Dtype> * solver, bp::object on_start, } // Seems boost cannot call the base method directly -void Solver_add_nccl(SGDSolver<Dtype>* solver +void Solver_add_nccl(Solver<Dtype>* solver #ifdef USE_NCCL , NCCL<Dtype>* nccl #endif |