Nonidem2.0 -- merge non-idempotent branch once it is fixed #96
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: haskell/lvish/Control/LVish.hs haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Data/LVar/IVar.hs haskell/lvish/Data/LVar/PureMap.hs haskell/lvish/Data/LVar/SLMap.hs haskell/lvish/lvish.cabal haskell/lvish/tests/LVishAndIVar.hs
It is still controlled by a dynamic flag, however.
Conflicts: haskell/lvish/Control/LVish/Sched.hs
Still seeing problematic failures on v9f for instance.
Conflicts: haskell/lvish/Control/LVish/Basics.hs haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Control/LVish/SchedQueue.hs haskell/lvish/lvish.cabal haskell/lvish/tests/SkipListTests.hs
Conflicts: haskell/DEVLOG.md haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Control/LVish/SchedQueue.hs haskell/lvish/lvish.cabal
…ething up because 12/70 tests fail.
Conflicts: haskell/DEVLOG.md haskell/lvish/Control/LVish/Sched.hs haskell/lvish/lvish.cabal haskell/lvish/tests/ArrayTests.hs
Conflicts: haskell/lvish/Control/LVish.hs haskell/lvish/Control/LVish/DeepFrz.hs haskell/lvish/Data/LVar/Generic/Internal.hs haskell/lvish/Data/LVar/IStructure.hs haskell/lvish/Data/LVar/IVar.hs haskell/lvish/Data/LVar/Internal/Pure.hs haskell/lvish/tests/ArrayTests.hs
Minor changes only.
This is a PAINFUL merge because git failed to track the moved files here. A simple refactor on the upstream has made this more difficult. This is in addition to the file renames that happened on the nonidem branch in the first place. After manually fixing things up, this rev builds and can run tests. But there are significant timeout failures!!! Conflicts: haskell/lvish/Control/LVish.hs haskell/lvish/Control/LVish/Basics.hs haskell/lvish/Control/LVish/DeepFrz.hs haskell/lvish/Control/LVish/Internal.hs haskell/lvish/Control/LVish/Logical.hs haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Control/LVish/SchedIdempotent.hs haskell/lvish/Control/LVish/Unsafe.hs haskell/lvish/Data/LVar/Counter.hs haskell/lvish/Data/LVar/CycGraph.hs haskell/lvish/Data/LVar/Generic/Internal.hs haskell/lvish/Data/LVar/IStructure.hs haskell/lvish/Data/LVar/IVar.hs haskell/lvish/Data/LVar/Internal/Pure.hs haskell/lvish/Data/LVar/LayeredSatMap.hs haskell/lvish/Data/LVar/NatArray.hs haskell/lvish/Data/LVar/PNCounter.hs haskell/lvish/Data/LVar/Pair.hs haskell/lvish/Data/LVar/PureMap.hs haskell/lvish/Data/LVar/PureMap/Unsafe.hs haskell/lvish/Data/LVar/PureSet.hs haskell/lvish/Data/LVar/SLMap.hs haskell/lvish/Data/LVar/SLSet.hs haskell/lvish/Data/LVar/SatMap.hs haskell/lvish/Experimental/BitArray.hs haskell/lvish/Internal/Control/LVish/SchedIdempotent.hs haskell/lvish/lvish.cabal haskell/lvish/tests/ArrayTests.hs haskell/lvish/tests/LVishAndIVar.hs haskell/lvish/tests/SNZITests.hs haskell/lvish/tests/SkipListTests.hs
rrnewton
changed the title
Conflicts: haskell/DEVLOG.md
rrnewton
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I think we can actually ignore #93, and do the merge here on the 2.0 line. This thing has gotten lousy with merges. It might be worth rebasing (or reformulating just the core patch to the scheduler module in a less invasive way).
However, before any of that ... we need to get it working! As written in the DEVLOG below, I'm currently seeing a bunch of lovelocks / timeouts: