Skip to content

Commit

Permalink
Merge pull request #7 from m-novikov/fix-windows-mp
Browse files Browse the repository at this point in the history
Fix windows pickling issue
  • Loading branch information
m-novikov authored Apr 2, 2019
2 parents 0dc28de + 2e11978 commit 1a2b8b2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ environment:

install:
- set DEV_PREFIX=%MINICONDA%/envs/%ENV_NAME%
- "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
- CALL %MINICONDA%/Scripts/activate.bat
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda install -c conda-forge conda-build conda-verify

build: off

test_script:
- conda build -c conda-forge conda-recipe
- CALL %MINICONDA%/Scripts/activate.bat
- conda build -c conda-forge -c ilastik-forge conda-recipe
5 changes: 3 additions & 2 deletions hytra/core/probabilitygenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def computeDivisionFeaturesOnCloud(
frameT,
featuresAtT,
featuresAtTPlus1,
imageProviderPlugin,
pluginManager,
labelImageFilename,
labelImagePath,
numDimensions,
Expand All @@ -191,6 +191,7 @@ def computeDivisionFeaturesOnCloud(
**returns** a tuple of `frameT` and the dictionary of the newly computed division
features for `frameT`
"""
imageProviderPlugin = pluginManager.getImageProvider()

# get the label image of the next frame
if (
Expand Down Expand Up @@ -548,7 +549,7 @@ def _extractAllFeatures(self, dispyNodeIps=[], turnOffFeatures=[]):
frame,
featuresPerFrame[frame],
featuresPerFrame[frame + 1],
self._pluginManager.getImageProvider(),
self._pluginManager,
self._options.labelImageFilename,
self._options.labelImagePath,
self.getNumDimensions(),
Expand Down

0 comments on commit 1a2b8b2

Please sign in to comment.