Skip to content

Instantly share code, notes, and snippets.

@lkuper
Created December 12, 2013 18:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save lkuper/7932596 to your computer and use it in GitHub Desktop.
Save lkuper/7932596 to your computer and use it in GitHub Desktop.
Last login: Thu Dec 12 12:09:00 on console
landin:~ lkuper$ cd repos/lvars/
landin:lvars lkuper$ git pull
remote: Counting objects: 972, done.
remote: Compressing objects: 100% (494/494), done.
remote: Total 790 (delta 448), reused 598 (delta 258)
Receiving objects: 100% (790/790), 187.72 KiB, done.
Resolving deltas: 100% (448/448), completed with 51 local objects.
From github.com:iu-parfunc/lvars
abeb337..26082c1 master -> origin/master
d012b78..62d28ac lvish-graph-algorithms -> origin/lvish-graph-algorithms
Updating abeb337..26082c1
Fast-forward
haskell/lvish/Control/LVish/BulkRetry.hs | 82 ++++++
haskell/lvish/Control/LVish/SchedIdempotent.hs | 31 +-
.../lvish/Control/LVish/SchedIdempotentInternal.hs | 2 +-
haskell/lvish/DEVLOG.md | 59 ++++
haskell/lvish/Data/Concurrent/LinkedMap.hs | 117 +++++++-
haskell/lvish/Data/Concurrent/SkipListMap.hs | 186 +++++++++++-
haskell/lvish/Data/LVar/AddRemoveSet.hs | 67 +++++
haskell/lvish/Data/LVar/Generic/Internal.hs | 2 +-
haskell/lvish/Data/LVar/IVar.hs | 7 +-
haskell/lvish/Data/LVar/Internal/Pure.hs | 56 +++-
haskell/lvish/Data/LVar/NatArray.hs | 4 +-
haskell/lvish/Data/LVar/PureMap.hs | 43 ++-
haskell/lvish/Data/LVar/PureMap/Unsafe.hs | 4 +-
haskell/lvish/Data/LVar/PureSet.hs | 14 +-
haskell/lvish/Data/LVar/SLMap.hs | 106 ++++++-
haskell/lvish/Data/LVar/SLSet.hs | 23 +-
haskell/lvish/Data/UtilInternal.hs | 12 +-
haskell/lvish/lvish.cabal | 15 +-
haskell/lvish/tests/ArrayTests.hs | 14 +-
haskell/lvish/tests/CommonMapTests.hs | 216 ++++++++++++++
haskell/lvish/tests/GenericTests.hs | 47 ++-
haskell/lvish/tests/LVishAndIVar.hs | 5 +-
haskell/lvish/tests/Main.hs | 22 +-
haskell/lvish/tests/Makefile | 34 +++
haskell/lvish/tests/MapTests.hs | 186 ------------
haskell/lvish/tests/PureMapTests.hs | 97 ++++++
haskell/lvish/tests/SLMapTests.hs | 63 ++++
haskell/lvish/tests/SkipListTests.hs | 217 ++++++++++----
haskell/lvish/tests/TestHelpers.hs | 107 +++++--
haskell/par-classes/Control/Par/Class.hs | 87 +++++-
haskell/par-classes/Data/Splittable/Class.hs | 47 +++
haskell/par-classes/par-classes.cabal | 12 +-
haskell/par-collections/Data/Par.hs | 106 +------
haskell/par-collections/Data/Par/List.hs | 20 ++
haskell/par-collections/Data/Par/Map.hs | 61 ++++
haskell/par-collections/Data/Par/Range.hs | 327 +++++++++++++--------
haskell/par-collections/Data/Par/Set.hs | 41 +++
haskell/par-collections/Data/Par/Splittable.hs | 143 +++++++++
haskell/par-collections/Data/Par/Traversable.hs | 89 ++++++
haskell/par-collections/Data/Par/Vector.hs | 26 ++
haskell/par-collections/Data/Splittable.hs | 18 --
haskell/par-collections/par-collections.cabal | 53 +++-
haskell/par-collections/tests/Main.hs | 127 ++++++++
haskell/par-collections/tests/TestHelpers.hs | 1 +
haskell/par-transformers/Control/LVish/CancelT.hs | 35 +--
.../par-transformers/bench/mergesort/MergeSort.hs | 14 +-
haskell/par-transformers/tests/CancelTests.hs | 4 +-
haskell/par-transformers/tests/STTests.hs | 20 +-
pbbs | 2 +-
49 files changed, 2418 insertions(+), 653 deletions(-)
create mode 100644 haskell/lvish/Control/LVish/BulkRetry.hs
create mode 100644 haskell/lvish/Data/LVar/AddRemoveSet.hs
create mode 100644 haskell/lvish/tests/CommonMapTests.hs
create mode 100644 haskell/lvish/tests/Makefile
delete mode 100644 haskell/lvish/tests/MapTests.hs
create mode 100644 haskell/lvish/tests/PureMapTests.hs
create mode 100644 haskell/lvish/tests/SLMapTests.hs
create mode 100644 haskell/par-classes/Data/Splittable/Class.hs
create mode 100644 haskell/par-collections/Data/Par/List.hs
create mode 100644 haskell/par-collections/Data/Par/Map.hs
create mode 100644 haskell/par-collections/Data/Par/Set.hs
create mode 100644 haskell/par-collections/Data/Par/Splittable.hs
create mode 100644 haskell/par-collections/Data/Par/Traversable.hs
create mode 100644 haskell/par-collections/Data/Par/Vector.hs
delete mode 100644 haskell/par-collections/Data/Splittable.hs
create mode 100644 haskell/par-collections/tests/Main.hs
create mode 120000 haskell/par-collections/tests/TestHelpers.hs
landin:lvars lkuper$
landin:lvars lkuper$ cd haskell/lvish
landin:lvish lkuper$ cabal build
./lvish.cabal has been changed. Re-configuring with most recently used
options. If this fails, please run configure manually.
Warning: The package list for 'hackage.haskell.org' is 55 days old.
Run 'cabal update' to get the latest list of available packages.
Resolving dependencies...
Configuring lvish-1.1.0.3...
cabal: At least the following dependencies are missing:
par-collections >=1.0 && <2.0
landin:lvish lkuper$ cd ..
landin:haskell lkuper$ ls
fhpc13-lvars lvish lvish-apps par-classes par-collections par-transformers
landin:haskell lkuper$ cd par-collections/
landin:par-collections lkuper$ cabal install
Warning: The package list for 'hackage.haskell.org' is 55 days old.
Run 'cabal update' to get the latest list of available packages.
Resolving dependencies...
Configuring par-collections-1.0...
Building par-collections-1.0...
Preprocessing library par-collections-1.0...
Data/Par/Splittable.hs:37:8:
Could not find module `Data.Splittable.Class'
Use -v to see a list of the files searched for.
Failed to install par-collections-1.0
cabal: Error: some packages failed to install:
par-collections-1.0 failed during the building phase. The exception was:
ExitFailure 1
landin:par-collections lkuper$ cabal update
Downloading the latest package list from hackage.haskell.org
Note: there is a new version of cabal-install available.
To upgrade, run: cabal install cabal-install
landin:par-collections lkuper$ cabal install cabal install
cabal: There is no package named 'install'.
You may need to run 'cabal update' to get the latest list of available
packages.
landin:par-collections lkuper$ cabal install cabal-install
Resolving dependencies...
Downloading cabal-install-1.18.0.2...
Configuring cabal-install-1.18.0.2...
Building cabal-install-1.18.0.2...
Preprocessing executable 'cabal' for cabal-install-1.18.0.2...
[ 1 of 73] Compiling Distribution.Client.Dependency.Modular.Version ( Distribution/Client/Dependency/Modular/Version.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Version.o )
[ 2 of 73] Compiling Distribution.Client.Dependency.Modular.PSQ ( Distribution/Client/Dependency/Modular/PSQ.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/PSQ.o )
[ 3 of 73] Compiling Distribution.Client.Dependency.Modular.Package ( Distribution/Client/Dependency/Modular/Package.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Package.o )
[ 4 of 73] Compiling Distribution.Client.Haddock ( Distribution/Client/Haddock.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Haddock.o )
[ 5 of 73] Compiling Distribution.Client.Compat.Environment ( Distribution/Client/Compat/Environment.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Compat/Environment.o )
[ 6 of 73] Compiling Distribution.Client.PackageUtils ( Distribution/Client/PackageUtils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/PackageUtils.o )
[ 7 of 73] Compiling Distribution.Client.World ( Distribution/Client/World.hs, dist/build/cabal/cabal-tmp/Distribution/Client/World.o )
[ 8 of 73] Compiling Distribution.Client.ParseUtils ( Distribution/Client/ParseUtils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/ParseUtils.o )
[ 9 of 73] Compiling Distribution.Client.BuildReports.Types ( Distribution/Client/BuildReports/Types.hs, dist/build/cabal/cabal-tmp/Distribution/Client/BuildReports/Types.o )
[10 of 73] Compiling Distribution.Client.Compat.FilePerms ( Distribution/Client/Compat/FilePerms.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Compat/FilePerms.o )
[11 of 73] Compiling Distribution.Client.GZipUtils ( Distribution/Client/GZipUtils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/GZipUtils.o )
[12 of 73] Compiling Distribution.Client.Compat.Semaphore ( Distribution/Client/Compat/Semaphore.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Compat/Semaphore.o )
[13 of 73] Compiling Distribution.Client.JobControl ( Distribution/Client/JobControl.hs, dist/build/cabal/cabal-tmp/Distribution/Client/JobControl.o )
[14 of 73] Compiling Distribution.Client.Compat.Time ( Distribution/Client/Compat/Time.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Compat/Time.o )
[15 of 73] Compiling Distribution.Client.Tar ( Distribution/Client/Tar.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Tar.o )
[16 of 73] Compiling Distribution.Client.Utils ( Distribution/Client/Utils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Utils.o )
[17 of 73] Compiling Distribution.Client.PackageIndex ( Distribution/Client/PackageIndex.hs, dist/build/cabal/cabal-tmp/Distribution/Client/PackageIndex.o )
[18 of 73] Compiling Distribution.Client.Types ( Distribution/Client/Types.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Types.o )
[19 of 73] Compiling Distribution.Client.Dependency.Modular.Flag ( Distribution/Client/Dependency/Modular/Flag.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Flag.o )
[20 of 73] Compiling Distribution.Client.Dependency.Modular.Dependency ( Distribution/Client/Dependency/Modular/Dependency.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Dependency.o )
[21 of 73] Compiling Distribution.Client.Dependency.Modular.Tree ( Distribution/Client/Dependency/Modular/Tree.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Tree.o )
[22 of 73] Compiling Distribution.Client.Dependency.Modular.Index ( Distribution/Client/Dependency/Modular/Index.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Index.o )
[23 of 73] Compiling Distribution.Client.Dependency.Modular.Builder ( Distribution/Client/Dependency/Modular/Builder.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Builder.o )
[24 of 73] Compiling Distribution.Client.Dependency.Modular.Message ( Distribution/Client/Dependency/Modular/Message.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Message.o )
[25 of 73] Compiling Distribution.Client.Dependency.Modular.Configured ( Distribution/Client/Dependency/Modular/Configured.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Configured.o )
[26 of 73] Compiling Distribution.Client.Dependency.Modular.Assignment ( Distribution/Client/Dependency/Modular/Assignment.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Assignment.o )
[27 of 73] Compiling Distribution.Client.Dependency.Modular.Validate ( Distribution/Client/Dependency/Modular/Validate.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Validate.o )
[28 of 73] Compiling Distribution.Client.Dependency.TopDown.Types ( Distribution/Client/Dependency/TopDown/Types.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/TopDown/Types.o )
[29 of 73] Compiling Distribution.Client.IndexUtils ( Distribution/Client/IndexUtils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/IndexUtils.o )
[30 of 73] Compiling Distribution.Client.Sandbox.Index ( Distribution/Client/Sandbox/Index.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Sandbox/Index.o )
[31 of 73] Compiling Distribution.Client.InstallPlan ( Distribution/Client/InstallPlan.hs, dist/build/cabal/cabal-tmp/Distribution/Client/InstallPlan.o )
[32 of 73] Compiling Distribution.Client.Dependency.Types ( Distribution/Client/Dependency/Types.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Types.o )
[33 of 73] Compiling Distribution.Client.Dependency.Modular.Log ( Distribution/Client/Dependency/Modular/Log.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Log.o )
[34 of 73] Compiling Distribution.Client.Dependency.Modular.Explore ( Distribution/Client/Dependency/Modular/Explore.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Explore.o )
[35 of 73] Compiling Distribution.Client.Dependency.Modular.Preference ( Distribution/Client/Dependency/Modular/Preference.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Preference.o )
[36 of 73] Compiling Distribution.Client.Dependency.Modular.Solver ( Distribution/Client/Dependency/Modular/Solver.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/Solver.o )
[37 of 73] Compiling Distribution.Client.Dependency.Modular.ConfiguredConversion ( Distribution/Client/Dependency/Modular/ConfiguredConversion.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/ConfiguredConversion.o )
[38 of 73] Compiling Distribution.Client.Dependency.Modular.IndexConversion ( Distribution/Client/Dependency/Modular/IndexConversion.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular/IndexConversion.o )
[39 of 73] Compiling Distribution.Client.Dependency.Modular ( Distribution/Client/Dependency/Modular.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/Modular.o )
[40 of 73] Compiling Distribution.Client.Dependency.TopDown.Constraints ( Distribution/Client/Dependency/TopDown/Constraints.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/TopDown/Constraints.o )
[41 of 73] Compiling Distribution.Client.Dependency.TopDown ( Distribution/Client/Dependency/TopDown.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency/TopDown.o )
[42 of 73] Compiling Distribution.Client.Init.Heuristics ( Distribution/Client/Init/Heuristics.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Init/Heuristics.o )
[43 of 73] Compiling Distribution.Client.Init.Licenses ( Distribution/Client/Init/Licenses.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Init/Licenses.o )
[44 of 73] Compiling Distribution.Client.Init.Types ( Distribution/Client/Init/Types.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Init/Types.o )
[45 of 73] Compiling Paths_cabal_install ( dist/build/autogen/Paths_cabal_install.hs, dist/build/cabal/cabal-tmp/Paths_cabal_install.o )
[46 of 73] Compiling Distribution.Client.HttpUtils ( Distribution/Client/HttpUtils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/HttpUtils.o )
[47 of 73] Compiling Distribution.Client.FetchUtils ( Distribution/Client/FetchUtils.hs, dist/build/cabal/cabal-tmp/Distribution/Client/FetchUtils.o )
[48 of 73] Compiling Distribution.Client.BuildReports.Anonymous ( Distribution/Client/BuildReports/Anonymous.hs, dist/build/cabal/cabal-tmp/Distribution/Client/BuildReports/Anonymous.o )
[49 of 73] Compiling Distribution.Client.BuildReports.Storage ( Distribution/Client/BuildReports/Storage.hs, dist/build/cabal/cabal-tmp/Distribution/Client/BuildReports/Storage.o )
[50 of 73] Compiling Distribution.Client.BuildReports.Upload ( Distribution/Client/BuildReports/Upload.hs, dist/build/cabal/cabal-tmp/Distribution/Client/BuildReports/Upload.o )
[51 of 73] Compiling Distribution.Client.Win32SelfUpgrade ( Distribution/Client/Win32SelfUpgrade.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Win32SelfUpgrade.o )
[52 of 73] Compiling Distribution.Client.Init ( Distribution/Client/Init.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Init.o )
[53 of 73] Compiling Distribution.Client.Sandbox.Types ( Distribution/Client/Sandbox/Types.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Sandbox/Types.o )
[54 of 73] Compiling Distribution.Client.Run ( Distribution/Client/Run.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Run.o )
[55 of 73] Compiling Distribution.Client.Check ( Distribution/Client/Check.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Check.o )
[56 of 73] Compiling Distribution.Client.Update ( Distribution/Client/Update.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Update.o )
[57 of 73] Compiling Distribution.Client.Targets ( Distribution/Client/Targets.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Targets.o )
[58 of 73] Compiling Distribution.Client.Dependency ( Distribution/Client/Dependency.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Dependency.o )
[59 of 73] Compiling Distribution.Client.Setup ( Distribution/Client/Setup.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Setup.o )
[60 of 73] Compiling Distribution.Client.Config ( Distribution/Client/Config.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Config.o )
[61 of 73] Compiling Distribution.Client.SetupWrapper ( Distribution/Client/SetupWrapper.hs, dist/build/cabal/cabal-tmp/Distribution/Client/SetupWrapper.o )
[62 of 73] Compiling Distribution.Client.Sandbox.Timestamp ( Distribution/Client/Sandbox/Timestamp.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Sandbox/Timestamp.o )
[63 of 73] Compiling Distribution.Client.Upload ( Distribution/Client/Upload.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Upload.o )
[64 of 73] Compiling Distribution.Client.List ( Distribution/Client/List.hs, dist/build/cabal/cabal-tmp/Distribution/Client/List.o )
[65 of 73] Compiling Distribution.Client.Configure ( Distribution/Client/Configure.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Configure.o )
[66 of 73] Compiling Distribution.Client.Fetch ( Distribution/Client/Fetch.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Fetch.o )
[67 of 73] Compiling Distribution.Client.SrcDist ( Distribution/Client/SrcDist.hs, dist/build/cabal/cabal-tmp/Distribution/Client/SrcDist.o )
[68 of 73] Compiling Distribution.Client.Get ( Distribution/Client/Get.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Get.o )
[69 of 73] Compiling Distribution.Client.Sandbox.PackageEnvironment ( Distribution/Client/Sandbox/PackageEnvironment.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Sandbox/PackageEnvironment.o )
[70 of 73] Compiling Distribution.Client.InstallSymlink ( Distribution/Client/InstallSymlink.hs, dist/build/cabal/cabal-tmp/Distribution/Client/InstallSymlink.o )
[71 of 73] Compiling Distribution.Client.Install ( Distribution/Client/Install.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Install.o )
[72 of 73] Compiling Distribution.Client.Sandbox ( Distribution/Client/Sandbox.hs, dist/build/cabal/cabal-tmp/Distribution/Client/Sandbox.o )
[73 of 73] Compiling Main ( Main.hs, dist/build/cabal/cabal-tmp/Main.o )
Linking dist/build/cabal/cabal ...
Warning: No documentation was generated as this package does not contain a
library. Perhaps you want to use the --executables, --tests or --benchmarks
flags.
Installing executable(s) in
/Users/lkuper/Library/Haskell/ghc-7.6.3/lib/cabal-install-1.18.0.2/bin
Warning: The directory
/Users/lkuper/Library/Haskell/ghc-7.6.3/lib/cabal-install-1.18.0.2/bin is not
in the system search path.
Installed cabal-install-1.18.0.2
Updating documentation index /Users/lkuper/Library/Haskell/doc/index.html
Warning: could not create a symlink in /Users/lkuper/Library/Haskell/bin for
cabal because the file exists there already but is not managed by cabal. You
can create a symlink for this executable manually if you wish. The executable
file has been installed at
/Users/lkuper/Library/Haskell/ghc-7.6.3/lib/cabal-install-1.18.0.2/bin/cabal
landin:par-collections lkuper$ cabal install
Resolving dependencies...
Configuring par-collections-1.0...
Building par-collections-1.0...
Preprocessing library par-collections-1.0...
Data/Par/Splittable.hs:37:8:
Could not find module `Data.Splittable.Class'
Use -v to see a list of the files searched for.
Failed to install par-collections-1.0
cabal: Error: some packages failed to install:
par-collections-1.0 failed during the building phase. The exception was:
ExitFailure 1
landin:par-collections lkuper$ git pull
Already up-to-date.
landin:par-collections lkuper$
landin:par-collections lkuper$ cd ..
landin:haskell lkuper$ cd lvish
landin:lvish lkuper$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment