Commit
a76f7ed#diff-01b00d8ba23682056ecc4e623b040a54
conflicts
Removing import py_paddle.swig_paddle as swig_api from the first line confilicts with line 38:
tmp = swig_api.ParameterOptimizer.create(self.opt_conf)
===========
This is the error
python2.7/site-packages/paddle/v2/optimizer.py", line 38, in enable_types
tmp = swig_api.ParameterOptimizer.create(self.opt_conf)
NameError: global name 'swig_api' is not defined