build(docker): use dockcross/web-wasi-threads as base for itkwasm/wasi

Author: thewtex

src/docker/itk-wasm-base/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE=docker.io/dockcross/web-wasm
 ARG HOST_ARCH=amd64
-FROM $BASE_IMAGE:20241229-8cdda7e-$HOST_ARCH
+FROM $BASE_IMAGE:20250107-aac97df-$HOST_ARCH
 ARG BASE_IMAGE
 
 LABEL maintainer="Matt McCormick [email protected]"
@@ -11,12 +11,12 @@ WORKDIR /
 COPY itk_wasm_env_vars.sh /
 
 # Note: on entry, emsdk will prepend to the path with its own node, so add to an earlier path
-ENV NODE_TAG v22.9.0
+ENV NODE_TAG=v22.9.0
 COPY install-node-js.sh /usr/local/bin/
 RUN /usr/local/bin/install-node-js.sh && rm /usr/local/bin/install-node-js.sh
-ENV PATH /emsdk/upstream/emscripten:${PATH}
+ENV PATH=/emsdk/upstream/emscripten:${PATH}
 
-ENV zstd_GIT_TAG v1.5.5
+ENV zstd_GIT_TAG=v1.5.5
 RUN curl -L https://github.com/api/repos/facebook/zstd/tarball/${zstd_GIT_TAG} | tar xz --strip=1 --one-top-level=zstd && \
   mkdir zstd-build && \
   cd zstd-build && \
@@ -51,6 +51,8 @@ ARG CXXFLAGS
 ENV LDFLAGS=${LDFLAGS:-"-flto -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB"}
 ENV CFLAGS=${CFLAGS:-"-msimd128 -flto -Wno-warn-absolute-paths -DITK_WASM_NO_FILESYSTEM_IO"}
 ENV CXXFLAGS=${CXXFLAGS:-"${CFLAGS}"}
+# Add our flags to the toolchain file
+COPY ./wasi-sdk-pthread-itkwasm.cmake /opt/wasi-sdk/share/cmake/wasi-sdk-pthread.cmake
 
 RUN mkdir ITK-build && \
   cd ITK-build && \
@@ -92,7 +94,7 @@ RUN mkdir ITK-build && \
   find . -name '*.o' -delete && \
   cd .. && chmod -R 777 ITK-build
 
-ENV ITKMeshToPolyData_GIT_TAG 1e594b7437a43be348b0ccea827c66fb5aa13e1f
+ENV ITKMeshToPolyData_GIT_TAG=1e594b7437a43be348b0ccea827c66fb5aa13e1f
 RUN git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData.git && \
   cd ITKMeshToPolyData && \
   git checkout ${ITKMeshToPolyData_GIT_TAG} && \
@@ -124,5 +126,5 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.vcs-ref=$VCS_REF \
       org.label-schema.vcs-url=$VCS_URL \
       org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
+ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
 WORKDIR /work

src/docker/itk-wasm-base/build.sh

@@ -30,6 +30,7 @@ for param; do
 done
 set -- "${newparams[@]}"  # overwrites the original positional params
 
+# Note: also need to set in wasi-sdk-pthread-itkwasm.cmake
 wasi_ld_flags="-flto -lwasi-emulated-process-clocks -lwasi-emulated-signal -lc-printscan-long-double"
 wasi_c_flags="-flto -msimd128 -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL"
 
@@ -67,7 +68,7 @@ if $wasi; then
           --build-arg VCS_REF=${VCS_REF} \
           --build-arg VCS_URL=${VCS_URL} \
           --build-arg BUILD_DATE=${BUILD_DATE} \
-          --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi \
+          --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
           --build-arg LDFLAGS="${wasi_ld_flags}" \
           --build-arg CFLAGS="${wasi_c_flags}" \
           $script_dir $@
@@ -80,7 +81,7 @@ if $wasi; then
                         --build-arg VCS_REF=${VCS_REF} \
                         --build-arg VCS_URL=${VCS_URL} \
                         --build-arg BUILD_DATE=${BUILD_DATE} \
-                        --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi \
+                        --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
                         --build-arg LDFLAGS="${wasi_ld_flags}" \
                         --build-arg CFLAGS="${wasi_c_flags}" \
                         $script_dir $@
@@ -122,7 +123,7 @@ if $debug; then
             --build-arg VCS_REF=${VCS_REF} \
             --build-arg VCS_URL=${VCS_URL} \
             --build-arg BUILD_DATE=${BUILD_DATE} \
-            --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi \
+            --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
             --build-arg LDFLAGS="${wasi_debug_ld_flags}" \
             --build-arg CFLAGS="${wasi_debug_c_flags}" \
             $script_dir $@
@@ -135,7 +136,7 @@ if $debug; then
                 --build-arg VCS_REF=${VCS_REF} \
                 --build-arg VCS_URL=${VCS_URL} \
                 --build-arg BUILD_DATE=${BUILD_DATE} \
-                --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi \
+                --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
                 --build-arg LDFLAGS="${wasi_debug_ld_flags}" \
                 --build-arg CFLAGS="${wasi_debug_c_flags}" \
                 $script_dir $@

src/docker/itk-wasm-base/wasi-sdk-pthread-itkwasm.cmake

@@ -0,0 +1,42 @@
+# Cmake toolchain description file for the Makefile
+
+set(CMAKE_SYSTEM_NAME WASI)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR wasm32)
+set(triple wasm32-wasi-threads)
+set(CMAKE_C_FLAGS "-pthread -matomics -mbulk-memory -flto -msimd128 -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL ${CMAKE_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
+# wasi-threads requires --import-memory.
+# wasi requires --export-memory.
+# (--export-memory is implicit unless --import-memory is given)
+set(CMAKE_EXE_LINKER_FLAGS "-Wl,--import-memory ${CMAKE_EXE_LINKER_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "-Wl,--export-memory ${CMAKE_EXE_LINKER_FLAGS}")
+# ITK-Wasm
+set(CMAKE_EXE_LINKER_FLAGS "-flto -lwasi-emulated-process-clocks -lwasi-emulated-signal -lc-printscan-long-double ${CMAKE_EXE_LINKER_FLAGS}")
+
+if(WIN32)
+	set(WASI_HOST_EXE_SUFFIX ".exe")
+else()
+	set(WASI_HOST_EXE_SUFFIX "")
+endif()
+
+# When building from source, WASI_SDK_PREFIX represents the generated directory
+if(NOT WASI_SDK_PREFIX)
+    set(WASI_SDK_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../)
+endif()
+
+set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_ASM_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_C_COMPILER_TARGET ${triple})
+set(CMAKE_CXX_COMPILER_TARGET ${triple})
+set(CMAKE_ASM_COMPILER_TARGET ${triple})
+
+# Don't look in the sysroot for executables to run during the build
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# Only look in the sysroot (not in the host paths) for the rest
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)