Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 0 additions & 140 deletions pymc3/progressbar.py

This file was deleted.

20 changes: 11 additions & 9 deletions pymc3/sampling.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
from collections import defaultdict

from joblib import Parallel, delayed
from numpy.random import randint, seed
from numpy import shape, asarray

from . import backends
from .backends.base import merge_traces, BaseTrace, MultiTrace
from .backends.ndarray import NDArray
from joblib import Parallel, delayed
from .model import modelcontext, Point
from .step_methods import (NUTS, HamiltonianMC, Metropolis, BinaryMetropolis,
BinaryGibbsMetropolis, Slice, ElemwiseCategorical, CompoundStep)
from .progressbar import progress_bar
from numpy.random import randint, seed
from numpy import shape, asarray
from collections import defaultdict
from tqdm import tqdm

import sys
sys.setrecursionlimit(10000)
Expand Down Expand Up @@ -159,11 +161,11 @@ def _sample(draws, step=None, start=None, trace=None, chain=0, tune=None,
progressbar=True, model=None, random_seed=-1):
sampling = _iter_sample(draws, step, start, trace, chain,
tune, model, random_seed)
progress = progress_bar(draws)
if progressbar:
sampling = tqdm(sampling, total=draws)
try:
for i, strace in enumerate(sampling):
if progressbar:
progress.update(i)
for strace in sampling:
pass
except KeyboardInterrupt:
strace.close()
return MultiTrace([strace])
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ theano>=0.8.2
pandas>=0.18.0
patsy>=0.4.0
joblib>=0.9
tqdm>=4.8.4
CommonMark==0.5.4
recommonmark
sphinx
Expand Down
1 change: 1 addition & 0 deletions scripts/create_testenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if [ ${PYTHON_VERSION} == "2.7" ]; then
conda install --yes mock enum34;
fi

pip install tqdm
pip install --no-deps numdifftools
pip install git+https://github.com/Theano/Theano.git
pip install git+https://github.com/mahmoudimus/nose-timer.git
Expand Down