Re: [sage-devel] Fwd: [ODK participants] Blog post on fast multivariate arithmetic

2017-07-12 Thread Francesco Biscani
In the benchmarks I use the C++ interfaces of FLINT and Boost.Multiprecision only for ease of initialization/destruction. The bulk of the operations is performed using directly the C API of FLINT and GMP. mp++ itself has some moderate template metaprogramming in place, but for instance it is curren

Re: [sage-devel] Fwd: [ODK participants] Blog post on fast multivariate arithmetic

2017-07-12 Thread 'Bill Hart' via sage-devel
Beware, Bernard Parisse has just helped me track down why the Flint timings for the sparse division only benchmark looked so ridiculously low. It turns out that due to an accident of interfacing between Nemo and Flint, it was using reflected lexicographical ordering instead of true lexicographic

Re: [sage-devel] Fwd: [ODK participants] Blog post on fast multivariate arithmetic

2017-07-12 Thread Francesco Biscani
Interesting timings, they give me some motivation to revisit the dense multiplication algorithm in piranha :) As an aside (and apologies if this is a slight thread hijack?), I have been spending some time in the last few weeks decoupling the multiprecision arithmetic bits from piranha into its own

[sage-devel] Re: Question on git merge

2017-07-12 Thread Simon King
Hi Nils, On 2017-07-12, Nils Bruin wrote: > On Wednesday, July 12, 2017 at 8:46:00 AM UTC+2, Simon King wrote: >> >> Actually I still miss the old sage development workflow with mercurial. > > Are you sure? It led to some precious losses of code: > > https://trac.sagemath.org/ticket/13447#comm

[sage-devel] Re: Question on git merge

2017-07-12 Thread Nils Bruin
On Wednesday, July 12, 2017 at 8:46:00 AM UTC+2, Simon King wrote: > > Actually I still miss the old sage development workflow with mercurial. > > Are you sure? It led to some precious losses of code: https://trac.sagemath.org/ticket/13447#comment:84 -- You received this message because you a

[sage-devel] Re: Question on git merge

2017-07-12 Thread Dima Pasechnik
a very useful option is to cherry-pick but not commit: git cherry-pick -n after this you can undo changes made by cherry-pick (by git reset -- or otherwise) then doing "git add -p ..." --- which is more robust than editing patches, and then commit the result. Well, yes, our old patch-quilt

Re: [sage-devel] Re: Question on git merge

2017-07-12 Thread Erik Bray
On Tue, Jul 11, 2017 at 6:13 PM, Simon King wrote: > Hi Erik, > > On 2017-07-11, Erik Bray wrote: >> cherry-pick basically does exactly that. If a patch doesn't apply >> with cherry-pick it will give you the opportunity to resolve the merge >> conflict manually, which you'll probably have to do