Merge pull request #25 from thewtex/itk-wasm-update

Itk wasm update

.github/workflows/wasm.yml

@@ -0,0 +1,23 @@
+name: WebAssembly
+
+on: [push,pull_request]
+
+jobs:
+  Build WebAssembly:
+    name: Build WebAssembly
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '18'
+
+    - name: Install
+      run: |
+        npm install
+
+    - name: Build
+      run: |
+        npm run build

.gitignore

@@ -35,3 +35,8 @@
 Cleaver2
 examples/.ipynb_checkpoints/
 examples/triangle_mesh.vtk
+
+wasi-build
+pnpm-lock.yaml
+node_modules/
+emscripten-build/

CMakeLists.txt

@@ -10,7 +10,9 @@ endif()
 
 include(FetchContent)
 set(_itk_build_testing ${BUILD_TESTING})
-#set(BUILD_TESTING OFF)
+if(WASI OR EMSCRIPTEN)
+  set(BUILD_TESTING OFF CACHE BOOL "Build testing code" FORCE)
+endif()
 if (CMAKE_CXX_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
 endif()
@@ -45,6 +47,9 @@ if(NOT ITK_SOURCE_DIR)
   find_package(ITK REQUIRED)
   list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
   include(ITKModuleExternal)
+  if(WASI OR EMSCRIPTEN)
+    add_subdirectory(wasm)
+  endif()
 else()
   set(ITK_DIR ${CMAKE_BINARY_DIR})
   itk_module_impl()

package.json

@@ -0,0 +1,16 @@
+{
+  "name": "itk-cleaver",
+  "version": "1.0.0",
+  "description": "npm scripts to generate itk-wasm artifacts.",
+  "type": "module",
+  "scripts": {
+    "build": "npm run build:emscripten && npm run bindgen:typescript",
+    "build:emscripten": "npx itk-wasm -b emscripten-build build",
+    "bindgen:typescript": "npx itk-wasm -b emscripten-build bindgen --output-dir wasm/typescript --package-name itk-cleaver --package-description \"The Cleaver multimaterial tetrahedral meshing tool.\" --repository 'https://github.com/SCIInstitute/Cleaver2'",
+    "clean": "git clean -fdx -e node_modules"
+  },
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "itk-wasm": "^1.0.0-b.70"
+  }
+}

examples/CMakeLists.txt → wasm/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(ITKCleaverWebAssembly)
+project(ITKCleaverWasm)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -25,8 +25,8 @@ find_package(ITK REQUIRED
   )
 include(${ITK_USE_FILE})
 
-add_executable(ITKCleaverWasm ITKCleaverWasm.cxx)
-target_link_libraries(ITKCleaverWasm PUBLIC ${ITK_LIBRARIES})
+add_executable(itk-cleaver ITKCleaverWasm.cxx)
+target_link_libraries(itk-cleaver PUBLIC ${ITK_LIBRARIES})
 
 enable_testing()
 add_test(NAME ITKCleaverWasmLabelImageTest

examples/ITKCleaverWasm.cxx → wasm/ITKCleaverWasm.cxx

@@ -19,7 +19,7 @@
 #include "itkPipeline.h"
 #include "itkInputImage.h"
 #include "itkOutputMesh.h"
-#include "itkSupportInputImageTypesNoVectorImage.h"
+#include "itkSupportInputImageTypes.h"
 #include "itkMesh.h"
 
 template<typename TImage>
@@ -98,9 +98,9 @@ class PipelineFunctor
 
 int main( int argc, char * argv[] )
 {
-  itk::wasm::Pipeline pipeline("Create a multi-material mesh suitable for simulation/modeling from an input label image or indicator function images", argc, argv);
+  itk::wasm::Pipeline pipeline("itk-cleaver", "Create a multi-material mesh suitable for simulation/modeling from an input label image or indicator function images", argc, argv);
 
-  return itk::wasm::SupportInputImageTypesNoVectorImage<PipelineFunctor,
+  return itk::wasm::SupportInputImageTypes<PipelineFunctor,
    //uint8_t,
    //int8_t,
    uint16_t,