12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove Vectorize, simplify to just numpy.squeeze

release/4.3a0
Duy-Nguyen Ta 2017-03-10 23:33:14 -05:00
parent 89bc31d703
commit 0e278f81c6
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wrap/Module.cpp
View File

@ -420,12 +420,6 @@ void Module::emit_cython_pyx(FileWriter& pyxFile) const {
"from libcpp.pair cimport pair\n" "from libcpp.pair cimport pair\n"
"from libcpp.string cimport string\n" "from libcpp.string cimport string\n"
"from cython.operator cimport dereference as deref\n\n\n"; "from cython.operator cimport dereference as deref\n\n\n";
pyxFile.oss <<
R"rawstr(def Vectorize(*args):
ret = npp.squeeze(npp.asarray(args, dtype='float'))
if ret.ndim == 0: ret = npp.expand_dims(ret, axis=0)
return ret
)rawstr";
// all classes include all forward declarations // all classes include all forward declarations
std::vector<Class> allClasses = expandedClasses; std::vector<Class> allClasses = expandedClasses;

2
wrap/ReturnType.cpp
View File

@ -94,7 +94,7 @@ std::string ReturnType::pyx_casting(const std::string& var,
if (isEigen()) { if (isEigen()) {
string s = "ndarray_copy(" + var + ")"; string s = "ndarray_copy(" + var + ")";
if (pyxClassName() == "Vector") if (pyxClassName() == "Vector")
return "Vectorize(" + s + ")"; return s + ".squeeze()";
else return s; else return s;
} }
else if (isNonBasicType()) { else if (isNonBasicType()) {