Skip to content
Open
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
6 changes: 3 additions & 3 deletions enspara/util/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import numpy as np
import mdtraj as md

# from sklearn.externals.joblib import Parallel, delayed

from .. import exception

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -116,11 +114,13 @@ def load_as_concatenated(filenames, lengths=None, processes=None,
logger.debug("Sounding %s trajectories with %s processes.",
len(filenames), processes)
with mp.Pool(processes=processes) as pool:
lengths = pool.starmap(
proc = pool.starmap_async(
sound_trajectory,
[(f, kw.get('stride', 1)) for f, kw
in zip(filenames, args) if 'frame' not in kw])

shapes = proc.get()

# trjs with frame are always length 1, add that to lengths now
for i, kw in enumerate(args):
if 'frame' in kw:
Expand Down