Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yaoyuping
nnDetection
Commits
537a3032
Commit
537a3032
authored
Aug 20, 2021
by
mibaumgartner
Browse files
fix restore seg, mark SegmentationEnsembler as experimental
parent
d7450974
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
nndet/inference/ensembler/segmentation.py
nndet/inference/ensembler/segmentation.py
+2
-0
nndet/inference/restore.py
nndet/inference/restore.py
+2
-2
No files found.
nndet/inference/ensembler/segmentation.py
View file @
537a3032
...
@@ -26,11 +26,13 @@ from torch import Tensor
...
@@ -26,11 +26,13 @@ from torch import Tensor
from
nndet.inference.ensembler.base
import
BaseEnsembler
from
nndet.inference.ensembler.base
import
BaseEnsembler
from
nndet.inference.restore
import
restore_fmap
from
nndet.inference.restore
import
restore_fmap
from
nndet.utils.info
import
experimental
class
SegmentationEnsembler
(
BaseEnsembler
):
class
SegmentationEnsembler
(
BaseEnsembler
):
ID
=
"seg"
ID
=
"seg"
@
experimental
def
__init__
(
self
,
def
__init__
(
self
,
seg_key
:
str
=
'pred_seg'
,
seg_key
:
str
=
'pred_seg'
,
data_key
:
str
=
'data'
,
data_key
:
str
=
'data'
,
...
...
nndet/inference/restore.py
View file @
537a3032
...
@@ -100,11 +100,11 @@ def restore_fmap(fmap: np.ndarray,
...
@@ -100,11 +100,11 @@ def restore_fmap(fmap: np.ndarray,
spacing_after_resampling
=
np
.
asarray
(
spacing_after_resampling
)
spacing_after_resampling
=
np
.
asarray
(
spacing_after_resampling
)
resampled_spacing
=
spacing_after_resampling
[
transpose_backward
]
resampled_spacing
=
spacing_after_resampling
[
transpose_backward
]
if
np
.
any
([
i
!=
j
for
i
,
j
in
zip
(
fmap
.
shape
[
1
:],
size_after_cropping
)]):
if
np
.
any
([
i
!=
j
for
i
,
j
in
zip
(
fmap
_transposed
.
shape
[
1
:],
size_after_cropping
)]):
lowres_axis
=
_get_lowres_axes
(
original_spacing
,
resampled_spacing
,
lowres_axis
=
_get_lowres_axes
(
original_spacing
,
resampled_spacing
,
do_separate_z
=
do_separate_z
)
do_separate_z
=
do_separate_z
)
logger
.
info
(
f
"Resampling: do separate z:
{
do_separate_z
}
; lowres axis:
{
lowres_axis
}
"
)
logger
.
info
(
f
"Resampling: do separate z:
{
do_separate_z
}
; lowres axis:
{
lowres_axis
}
"
)
fmap_old_spacing
=
resample_data_or_seg
(
fmap
,
size_after_cropping
,
is_seg
=
False
,
fmap_old_spacing
=
resample_data_or_seg
(
fmap
_transposed
,
size_after_cropping
,
is_seg
=
False
,
axis
=
lowres_axis
,
order
=
interpolation_order
,
axis
=
lowres_axis
,
order
=
interpolation_order
,
do_separate_z
=
do_separate_z
,
cval
=
0
,
do_separate_z
=
do_separate_z
,
cval
=
0
,
order_z
=
interpolation_order_z
)
order_z
=
interpolation_order_z
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment