Skip to content

Commit

Permalink
Merge pull request #445 from Dekken/joblib
Browse files Browse the repository at this point in the history
import joblib instead of sklearn.joblib
  • Loading branch information
PhilipDeegan authored May 17, 2020
2 parents c96c27c + 5cc8c60 commit 1b56924
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/sphinxext/gen_rst.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def execfile(filename, global_vars=None, local_vars=None):
pass


from sklearn.externals import joblib
import joblib

###############################################################################
# A tee object to redict streams to multiple outputs
Expand Down
2 changes: 1 addition & 1 deletion tick/preprocessing/longitudinal_features_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from itertools import combinations
from copy import deepcopy
from scipy.special import comb
from sklearn.externals.joblib import Parallel, delayed
from joblib import Parallel, delayed
from tick.preprocessing.base import LongitudinalPreprocessor
from .build.preprocessing import SparseLongitudinalFeaturesProduct
from .utils import check_longitudinal_features_consistency
Expand Down

0 comments on commit 1b56924

Please sign in to comment.