enabling the alternate solvers to be accessed by the python interface · bjthemost/Caffe-HRT@5cc76ad · GitHub

1. bjthemost
2. Caffe-HRT

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit 5cc76ad

Browse filesBrowse the repository at this point in the historyBrowse files

Daniel Gordon

committed

enabling the alternate solvers to be accessed by the python interface

1 parent 66823b5 commit 5cc76ad
Copy full SHA for 5cc76ad

3 files changed

+12-2Lines changed: 12 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• python/caffe
  • __init__.py
  • _caffe.cpp
  • pycaffe.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎python/caffe/__init__.py‎

Copy file name to clipboardExpand all lines: python/caffe/__init__.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1,4 +1,4 @@
1		- from .pycaffe import Net, SGDSolver
	1	+ from .pycaffe import Net, SGDSolver, NesterovSolver, AdaGradSolver, RMSPropSolver, AdaDeltaSolver, AdamSolver
2	2	from ._caffe import set_mode_cpu, set_mode_gpu, set_device, Layer, get_solver, layer_type_list
3	3	from .proto.caffe_pb2 import TRAIN, TEST
4	4	from .classifier import Classifier

Collapse file

‎python/caffe/_caffe.cpp‎

Copy file name to clipboardExpand all lines: python/caffe/_caffe.cpp

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -297,6 +297,15 @@ BOOST_PYTHON_MODULE(_caffe) {
297	297	bp::class_<AdaGradSolver<Dtype>, bp::bases<Solver<Dtype> >,
298	298	shared_ptr<AdaGradSolver<Dtype> >, boost::noncopyable>(
299	299	"AdaGradSolver", bp::init<string>());
	300	+ bp::class_<RMSPropSolver<Dtype>, bp::bases<Solver<Dtype> >,
	301	+ shared_ptr<RMSPropSolver<Dtype> >, boost::noncopyable>(
	302	+ "RMSPropSolver", bp::init<string>());
	303	+ bp::class_<AdaDeltaSolver<Dtype>, bp::bases<Solver<Dtype> >,
	304	+ shared_ptr<AdaDeltaSolver<Dtype> >, boost::noncopyable>(
	305	+ "AdaDeltaSolver", bp::init<string>());
	306	+ bp::class_<AdamSolver<Dtype>, bp::bases<Solver<Dtype> >,
	307	+ shared_ptr<AdamSolver<Dtype> >, boost::noncopyable>(
	308	+ "AdamSolver", bp::init<string>());
300	309
301	310	bp::def("get_solver", &GetSolverFromFile,
302	311	bp::return_value_policy<bp::manage_new_object>());

Collapse file

‎python/caffe/pycaffe.py‎

Copy file name to clipboardExpand all lines: python/caffe/pycaffe.py

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -10,7 +10,8 @@
10	10	from itertools import zip_longest as izip_longest
11	11	import numpy as np
12	12
13		- from ._caffe import Net, SGDSolver
	13	+ from ._caffe import Net, SGDSolver, NesterovSolver, AdaGradSolver, \
	14	+ RMSPropSolver, AdaDeltaSolver, AdamSolver
14	15	import caffe.io
15	16
16	17	# We directly update methods from Net here (rather than using composition or

0 commit comments

Comments

0 (0)