Skip to content

Commit

Permalink
pathos -> dill only
Browse files Browse the repository at this point in the history
  • Loading branch information
francoislaurent committed Mar 30, 2021
1 parent f36a03b commit e4aacd2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest pathos
python -m pip install pytest dill
python -m pip install .[roi]
- name: Test with pytest (Windows)
if: ${{ runner.os == 'Windows' }}
Expand Down
10 changes: 5 additions & 5 deletions tramway/core/parallel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
# knowledge of the CeCILL license and that you accept its terms.


import sys
if sys.platform.startswith('linux'):
import multiprocessing
else:
import pathos.multiprocessing as multiprocessing
try:
import dill
except ImportError:
pass
import multiprocessing
try:
import queue
except ImportError:
Expand Down
10 changes: 5 additions & 5 deletions tramway/inference/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
from copy import copy
from collections import OrderedDict

import sys
if sys.platform.startswith('linux'):
from multiprocessing import Pool, Lock
else:
from pathos.multiprocessing import Pool, Lock
try:
import dill
except ImportError:
pass
from multiprocessing import Pool, Lock

import os # for os.name
import six
Expand Down

0 comments on commit e4aacd2

Please sign in to comment.