Skip to content

Commit

Permalink
ENH: Bump elastix to 5.2.0, update wasm
Browse files Browse the repository at this point in the history
Rebase wasm patches for elastix. Bump itk-wasm and the ITK-Wasm docker
image for ITK 5.4.0 support. Disable a wasi test with an odd error:

3: Test command: /wasi-runtimes/wasmtime/bin/wasmtime-pwd.sh "/work/wasi-build/elastix.wasi.wasm" "/work/wasm/test/data/input/parameters_single.json" "/work/wasi-build/wasm/CT_2D_head_registered_initial.iwi.cbor" "/work/wasi-build/wasm/CT_2D_head_initial.h5" "/work/wasi-build/wasm/CT_2D_head_initial.json" "-f" "/work/wasm/test/data/input/CT_2D_head_fixed.iwi.cbor" "-m" "/work/wasm/test/data/input/CT_2D_head_moving.iwi.cbor" "-i" "/work/wasm/test/data/input/CT_2D_head_translation.h5"
3: Working Directory: /work/wasi-build/wasm
3: Test timeout computed to be: 10000000
3: Error: failed to run main module `/work/wasi-build/elastix.wasi.wasm`
3:
3: Caused by:
3:     0: failed to invoke command default
3:     1: error while executing at wasm backtrace:
3:            0: 0x388ff6 - elastix.wasi.wasm!__cxx_global_array_dtor.54
3:            1: 0x95b08 - elastix.wasi.wasm!__funcs_on_exit
3:            2: 0x95cb2 - elastix.wasi.wasm!__wasm_call_dtors
3:            3: 0x15df748 - elastix.wasi.wasm!itk_wasm_delayed_exit
3:            4: 0x15df7d1 - elastix.wasi.wasm!_start
3:        note: using the `WASMTIME_BACKTRACE_DETAILS=1` environment variable may show more debugging information
3:     2: wasm trap: uninitialized element
 3/10 Test  #3: elastix-wasm-2d-initial-transform-test ....................***Failed    7.99 sec
  • Loading branch information
thewtex committed Jul 19, 2024
1 parent d2e5098 commit e04e4b6
Show file tree
Hide file tree
Showing 42 changed files with 701 additions and 299 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ endif()
# set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git")
# Upstream + wasm patches
# Branch: ITKElastix-2023-01-01-022aa6cd
set(elastix_GIT_TAG "022aa6cdaaa5621f3d6b2f245c388a9669cc7ef9")
# Branch: ITKElastix-2024-07-18-ebb429a33b
set(elastix_GIT_TAG "0ab3f57a6528cce609feedeb1650e7c850beca94")
FetchContent_Declare(
elx
GIT_REPOSITORY ${elastix_GIT_REPOSITORY}
Expand Down
Loading

0 comments on commit e04e4b6

Please sign in to comment.