search

diffpy / libdiffpy

DiffPy C++ library for calculation of PDF and other real-space quantities
Other
7 stars 13 forks source link

requires version < blitz0.10 #1

Closed mmckerns closed 10 years ago

mmckerns commented 10 years ago

imports of tinyvec-et.h and tinymat.h are not in blitz0.10. Looks like they are replaced by tinyvec2.h and tinymat2.h. libdiffpy's README.txt doesn't specify which version of blitz to use, so I'm assuming that it should be the most current.

pavoljuhas commented 10 years ago

Added blitz10 branch which compiles with blitz 0.10. The develop branch requires blitz 0.9. I have also added ublas branch which uses boost/ublas library instead of blitz. If the ublas performs comparably to blitz, I would just transfer to ublas and completely remove the blitz dependency.

As for now, to build libdiffpy with minimum dependency hassles, use the ublas branch. If you have blitz 0.9 use the develop branch. If you have blitz 0.10 use the blitz10 branch.

mmckerns commented 10 years ago

Thanks Pavol. You may want to stick that in the docs (i.e. the README) to document the motivation for the branch as an easy reminder.

pavoljuhas commented 10 years ago

I have merged the ublas branch to develop, so there is no more dependency on the blitz library. The boost_ublas is now used instead and there does not seem to be any speed penalty. The blitz versions are kept in branches blitz09 and blitz10.

mmckerns commented 10 years ago

Awesome.