Re: New version of vector + discussion

Yes. The difficulty is a3a65b56a7d09. Roman changed the stream representation in vector. These changes were part of what led to our ICFP paper. BOS made a giant patch that undid all these changes in the 0.10 branch, but they lived on in master. One issue with the change in representation is that they break compatibility with DPH. I have patches to fix this. However, the change in representation has not been extensively performance tested, so there may be performance regressions. Geoff On 06/26/2014 11:02 AM, Johan Tibell wrote:

Geoffrey, you did a bunch of hacking on vector at some point, right? Do you have an idea why the branches have diverged?

On Thu, Jun 26, 2014 at 4:42 PM, Gregory Collins mailto:greg@gregorycollins.net> wrote:

Hi all,

I've prepped a new minor version (0.10.12.0) of the 0.10 branch of vector so that we can release https://github.com/haskell/vector/pull/31, which I cherry-picked from master. Could someone please review this and do the upload? I'm not sure I have the right bit set.

Also, in a related topic, an aside: I tried to merge 0.10 into master and got a horrorshow:

# Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # #both modified: Data/Vector.hs #deleted by them: Data/Vector/Fusion/Bundle/Monadic.hs #both modified: Data/Vector/Fusion/Stream.hs #both modified: Data/Vector/Fusion/Stream/Monadic.hs #both modified: Data/Vector/Fusion/Stream/Size.hs #both modified: Data/Vector/Generic.hs #both modified: Data/Vector/Generic/Mutable.hs #deleted by them: Data/Vector/Generic/Mutable/Base.hs #both modified: Data/Vector/Generic/New.hs #both modified: Data/Vector/Mutable.hs #both modified: Data/Vector/Storable.hs #both modified: Data/Vector/Unboxed.hs #both modified: Data/Vector/Unboxed/Base.hs #both added: README.md #both modified: benchmarks/vector-benchmarks.cabal #both added: changelog #both modified: internal/unbox-tuple-instances #both modified: tests/vector-tests.cabal #both modified: vector.cabal

I'm curious why these branches have diverged like this, it doesn't smell good to me. Does anyone want to tackle doing this merge?

G -- Gregory Collins mailto:greg@gregorycollins.net>

_______________________________________________ Libraries mailing list Libraries@haskell.org mailto:Libraries@haskell.org http://www.haskell.org/mailman/listinfo/libraries