Skip to content

Commit 084fb81

Browse files
committed
Temporary fix to Porespy/Scikit-Image deprecation
The latest version of Porespy has not merged their fix for the deprecated scikit-image "skeletonize_3D" function into the main development branch yet, so this commit is a workaround for the sake of importing and Sphinx documentation.
1 parent cf0c5b5 commit 084fb81

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ feret
44
numpy
55
opencv-python
66
openpnm
7-
porespy
7+
porespy @ git+https://github.com/PMEAL/porespy.git@fix_scikit_image_deprecations
88
pypardiso
99
scikit-image
1010
scipy

src/pore2chip/metrics.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22
from skimage.measure import label, regionprops
33
import feret
4-
import porespy as ps
4+
from porespy import networks, networks, filters
55
import openpnm as op
66
import copy
77
from skimage.segmentation import watershed
@@ -98,7 +98,7 @@ def extract_diameters(img_list, voxel_size=1):
9898
Tuple of numpy arrays : Tuple of arrays of pore diameters and pore throat diameters
9999
"""
100100
images = copy.deepcopy(img_list)
101-
snow_output = ps.networks.snow2(images, voxel_size=voxel_size)
101+
snow_output = networks.snow2(images, voxel_size=voxel_size)
102102
pn = op.io.network_from_porespy(snow_output.network)
103103

104104
return pn["pore.equivalent_diameter"], pn["throat.equivalent_diameter"]
@@ -129,7 +129,7 @@ def extract_diameters2(img_list, voxel_size=1, sigma_val=0.4):
129129

130130
regions = watershed(image=-dt, markers=peaks, mask=dt > 0)
131131
regions = randomize_colors(regions)
132-
net = ps.networks.regions_to_network(regions * img_list, voxel_size=1)
132+
net = networks.regions_to_network(regions * img_list, voxel_size=1)
133133
pn = op.io.network_from_porespy(net)
134134
return pn["pore.equivalent_diameter"], pn["throat.equivalent_diameter"]
135135

@@ -147,8 +147,8 @@ def extract_diameters_alt(img_list, num_bins=10):
147147
Numpy array : Array of pore diameters
148148
"""
149149
#inverted = cv.bitwise_not(img_list)
150-
filtered = ps.filters.local_thickness(img_list)
151-
psd = ps.metrics.pore_size_distribution(filtered, bins=num_bins, log=False)
150+
filtered = filters.local_thickness(img_list)
151+
psd = metrics.pore_size_distribution(filtered, bins=num_bins, log=False)
152152
return psd
153153

154154

0 commit comments

Comments
 (0)