Merge branch 'master' into maria/notebooks-sampling

tweag · Oct 18, 2022 · 83b5802 · 83b5802
2 parents 3559d87 + 635b7d7
commit 83b5802
Show file tree

Hide file tree

Showing 17 changed files with 824 additions and 70,929 deletions.
diff --git a/.envrc b/.envrc
@@ -1,2 +1,2 @@
-# use_flake
-use_nix
+# Make sure you have direnv >= 2.30
+use flake --extra-experimental-features nix-command --extra-experimental-features flakes
diff --git a/benchmark/Single.hs b/benchmark/Single.hs
@@ -10,7 +10,7 @@ import Control.Monad.Bayes.Inference.SMC
   )
 import Control.Monad.Bayes.Population
 import Control.Monad.Bayes.Sampler.Strict
-import Control.Monad.Bayes.Traced
+import Control.Monad.Bayes.Traced hiding (model)
 import Control.Monad.Bayes.Weighted
 import Control.Monad.ST (runST)
 import Data.Time (diffUTCTime, getCurrentTime)