Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/publish-elastix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ jobs:
shell: cmd
run: |
cd elastix-build
cmake -DCMAKE_C_COMPILER="${{ inputs.c-compiler }}" ^
-DCMAKE_CXX_COMPILER="${{ inputs.cxx-compiler }}" ^
-DCMAKE_BUILD_TYPE="${{ inputs.cmake-build-type }}" ^
cmake -DCMAKE_C_COMPILER="${{ matrix.c-compiler }}" ^
-DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" ^
-DCMAKE_BUILD_TYPE="${{ matrix.cmake-build-type }}" ^
-DITK_DIR=../ITK-build ^
-DCMAKE_CUDA_FLAGS="-allow-unsupported-compiler -Xcompiler \"/D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH\"" ^
-DTorch_DIR=../libtorch/libtorch/share/cmake/Torch ^
Expand All @@ -159,9 +159,9 @@ jobs:
shell: bash
run: |
cd elastix-build
cmake -DCMAKE_C_COMPILER="${{ inputs.c-compiler }}" \
-DCMAKE_CXX_COMPILER="${{ inputs.cxx-compiler }}" \
-DCMAKE_BUILD_TYPE="${{ inputs.cmake-build-type }}" \
cmake -DCMAKE_C_COMPILER="${{ matrix.c-compiler }}" \
-DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" \
-DCMAKE_BUILD_TYPE="${{ matrix.cmake-build-type }}" \
-DITK_DIR=../ITK-build \
-DTorch_DIR=../libtorch/libtorch/share/cmake/Torch \
-DUSE_ALL_COMPONENTS=ON \
Expand Down
7 changes: 4 additions & 3 deletions Components/Metrics/Impact/elxImpactMetric.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace elastix
* (ImpactGPU 0)
* (ImpactUseMixedPrecision "true")
* (ImpactFeaturesMapUpdateInterval -1)
* (ImpactWriteFeatureMaps "false")
* (ImpactFeatureMapOutputDirectory "")
* \endcode
*
* ### Parameter Descriptions
Expand Down Expand Up @@ -105,7 +105,8 @@ namespace elastix
* - Set to `-1` to compute once per resolution level.
* - Set to a positive integer to recompute every _N_ iterations.
*
* \param ImpactWriteFeatureMaps Enables saving both the input images and feature maps to disk (in Static mode).
* \param ImpactFeatureMapOutputDirectory Enables saving both the input images and feature maps to disk (in Static
* mode).
*
* ### Advanced Use: Multi-resolution and Multi-model Setup
*
Expand Down Expand Up @@ -137,7 +138,7 @@ namespace elastix
* (ImpactGPU 0 0)
* (ImpactUseMixedPrecision "true" "true")
* (ImpactFeaturesMapUpdateInterval -1 -1)
* (ImpactWriteFeatureMaps "false" "false")
* (ImpactFeatureMapOutputDirectory "" "")
* \endcode
*
* **Multi-model Setup**:
Expand Down
7 changes: 4 additions & 3 deletions Components/Metrics/Impact/elxImpactMetric.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,10 @@ ImpactMetric<TElastix>::BeforeEachResolution()

if (mode == "Static")
{
std::string writeFeatureMapsStr = "false";
configuration.ReadParameter(writeFeatureMapsStr, "ImpactWriteFeatureMaps", this->GetComponentLabel(), level, 0);
if (writeFeatureMapsStr != "false")
std::string writeFeatureMapsStr = "";
configuration.ReadParameter(
writeFeatureMapsStr, "ImpactFeatureMapOutputDirectory", this->GetComponentLabel(), level, 0);
if (!writeFeatureMapsStr.empty())
{
// If enabled, prepare output directory for feature map export (Static mode)
if (!std::filesystem::exists(writeFeatureMapsStr))
Expand Down
2 changes: 1 addition & 1 deletion Testing/Data/parameters.2D.IMPACT.bspline.ASGD.002.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
(ImpactMode "Static")
(ImpactGPU -1)
(ImpactFeaturesMapUpdateInterval -1)
(ImpactWriteFeatureMaps "./Features/")
(ImpactFeatureMapOutputDirectory "./Features/")



Expand Down
2 changes: 1 addition & 1 deletion Testing/Data/parameters.3D.IMPACT.bspline.ASGD.001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
(ImpactMode "Jacobian")
(ImpactGPU -1)
(ImpactFeaturesMapUpdateInterval -1)
(ImpactWriteFeatureMaps "false")
(ImpactFeatureMapOutputDirectory "")


// ********** Several
Expand Down
2 changes: 1 addition & 1 deletion Testing/Data/parameters.3D.IMPACT.bspline.ASGD.002.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
(ImpactMode "Static")
(ImpactGPU -1)
(ImpactFeaturesMapUpdateInterval -1)
(ImpactWriteFeatureMaps "false")
(ImpactFeatureMapOutputDirectory "")


// ********** Several
Expand Down
Loading