Np 1172 wasm bindings #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

HellAholic merged 74 commits into main from NP-1172-wasm-bindings

Oct 3, 2025

.github/workflows/conan-package.yml → .github/workflows/package.yml

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    name: conan-package
+    name: package
     on:
       push:
@@ Expand All / @@ -12,8 +12,9 @@ on: @@
           - 'conandata.yml'
           - 'CMakeLists.txt'
           - 'requirements.txt'
-          - '.github/workflows/conan-package.yml'
+          - '.github/workflows/package.yml'
           - '.github/workflows/requirements*'
+          - 'libnest2d_js/**'
         branches:
           - main
           - 'CURA-*'
@@ Expand All / @@ -25,4 +26,13 @@ on: @@
     jobs:
       conan-package:
         uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main
+        with:
+          platform_wasm: true
         secrets: inherit
+      npm-package:
+        needs: [ conan-package ]
+        uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@main
+        with:
+          package_version_full: ${{ needs.conan-package.outputs.package_version_full }}
+        secrets: inherit

CMakeLists.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,10 +2,12 @@ cmake_minimum_required(VERSION 3.20)
  
    cmake_policy(SET CMP0091 NEW)

    project(libnest2d)

    find_package(standardprojectsettings REQUIRED)

    find_package(spdlog REQUIRED)

    option(BUILD_SHARED_LIBS "Build shared libs instead of static (applies for dependencies as well)" OFF)

    option(HEADER_ONLY "If enabled static library will not be built." ON)

    option(ENABLE_TESTING "Build with Google unittest" OFF)

    option(WITH_JS_BINDINGS "Build JS/WASM bindings for npm package" OFF)

    set(GEOMETRIES clipper CACHE STRING "Geometry backend, available options: 'clipper' (default), 'boost'")

    set(OPTIMIZER nlopt CACHE STRING "Optimization backend, available options: 'nlopt' (default), 'optimlib'")

    set(THREADING std CACHE STRING "Multithreading, available options: 'std' (default), 'tbb', 'omp', 'none'")

    @@ -54,7 +56,7 @@ target_compile_definitions(project_options INTERFACE LIBNEST2D_GEOMETRIES_${GEOM
  
    if("${OPTIMIZER}" STREQUAL "nlopt")

        find_package(NLopt REQUIRED)

        target_link_libraries(project_options INTERFACE NLopt::nlopt)

        target_link_libraries(project_options INTERFACE NLopt::nlopt spdlog::spdlog)

        list(APPEND nest2d_HDRS

                include/libnest2d/optimizers/nlopt/simplex.hpp

                include/libnest2d/optimizers/nlopt/subplex.hpp

    @@ -89,17 +91,22 @@ endif()
  
    target_compile_definitions(project_options INTERFACE LIBNEST2D_THREADING_${THREADING})

    set(libnest2d_SRCS

            src/libnest2d.cpp

            )

        src/libnest2d.cpp

    )

    if(WITH_JS_BINDINGS OR EMSCRIPTEN)

        add_subdirectory(libnest2d_js)

    endif()

    if(HEADER_ONLY)

        add_library(nest2d INTERFACE ${libnest2d_HDRS})

        target_link_libraries(nest2d INTERFACE project_options)

        target_include_directories(nest2d

                INTERFACE

                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>

                    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

                )

            INTERFACE

                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>

                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

        )

    else()

        if(BUILD_SHARED_LIBS)

            add_library(nest2d SHARED ${libnest2d_SRCS} ${libnest2d_HDRS})

    @@ -111,12 +118,12 @@ else()
  
        endif()

        target_link_libraries(nest2d PUBLIC project_options)

        target_include_directories(nest2d

                PUBLIC

                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>

                    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

                PRIVATE

                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>

                )

            PUBLIC

                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>

                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

            PRIVATE

                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>

        )

    endif()

    if(ENABLE_TESTING)

conanfile.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,28 +15,33 @@ @@
     class Nest2DConan(ConanFile):
         name = "nest2d"
+        author = "UltiMaker"
+        url = "https://github.com/Ultimaker/libnest2d"
         description = "2D irregular bin packaging and nesting library written in modern C++"
         topics = ("conan", "cura", "prusaslicer", "nesting", "c++", "bin packaging")
         settings = "os", "compiler", "build_type", "arch"
         build_policy = "missing"
         package_type = "library"
         implements = ["auto_header_only"]
+        python_requires = "npmpackage/[>=1.0.0]"
         options = {
             "shared": [True, False],
             "fPIC": [True, False],
             "header_only": [True, False],
             "geometries": ["clipper", "boost"],
             "optimizer": ["nlopt", "optimlib"],
-            "threading": ["std", "tbb", "omp", "none"]
+            "threading": ["std", "tbb", "omp", "none"],
+            "with_js_bindings": [True, False]
         }
         default_options = {
             "shared": True,
             "fPIC": True,
             "header_only": False,
             "geometries": "clipper",
             "optimizer": "nlopt",
-            "threading": "std"
+            "threading": "std",
+            "with_js_bindings": False
         }
         def set_version(self):
@@ Expand Down Expand Up / @@ -67,12 +72,24 @@ def export_sources(self): @@
             copy(self, "*", path.join(self.recipe_folder, "include"), path.join(self.export_sources_folder, "include"))
             copy(self, "*", path.join(self.recipe_folder, "tests"), path.join(self.export_sources_folder, "tests"))
             copy(self, "*", path.join(self.recipe_folder, "tools"), path.join(self.export_sources_folder, "tools"))
+            copy(self, "*", path.join(self.recipe_folder, "libnest2d_js"),
+                 os.path.join(self.export_sources_folder, "libnest2d_js"))
         def layout(self):
             cmake_layout(self)
+            self.cpp.build.bin = []
+            self.cpp.build.bindirs = []
+            self.cpp.package.bindirs = ["bin"]
             self.cpp.package.libs = ["nest2d"]
+            if self.settings.os == "Emscripten":
+                self.cpp.build.bin = ["libnest2d_js.js"]
+                self.cpp.package.bin = ["libnest2d_js.js"]
+                self.cpp.build.bindirs += ["libnest2d_js"]
+            self.cpp.package.includedirs = ["include"]
         def requirements(self):
+            self.requires("spdlog/[>=1.14.1]", transitive_headers=True)
             if self.options.geometries == "clipper":
                 self.requires("clipper/6.4.2@ultimaker/stable", transitive_headers=True)
             if self.options.geometries == "boost" or self.options.geometries == "clipper":
@@ Expand Down Expand Up / @@ -133,6 +150,7 @@ def generate(self): @@
             tc.variables["GEOMETRIES"] = self.options.geometries
             tc.variables["OPTIMIZER"] = self.options.optimizer
             tc.variables["THREADING"] = self.options.threading
+            tc.variables["WITH_JS_BINDINGS"] = self.options.get_safe("with_js_bindings", False)
             tc.generate()
@@ Expand All / @@ -142,7 +160,19 @@ def build(self): @@
             cmake.build()
             cmake.install()
+        def deploy(self):
+            if self.settings.os == "Emscripten" or self.options.get_safe("with_js_bindings", False):
+                copy(self, "libnest2d_js*", src=os.path.join(self.package_folder, "bin"), dst=self.install_folder)
+                copy(self, "*", src=os.path.join(self.package_folder, "bin"), dst=self.install_folder)
         def package(self):
+            if self.settings.os == "Emscripten" or self.options.get_safe("with_js_bindings", False):
+                copy(self, pattern="libnest2d_js*", src=os.path.join(self.build_folder, "libnest2d_js"),
+                     dst=os.path.join(self.package_folder, "bin"))
+                copy(self, f"*.d.ts", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
+                copy(self, f"*.js", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
+                copy(self, f"*.wasm", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
             packager = AutoPackager(self)
             packager.run()
@@ Expand All / @@ -162,3 +192,10 @@ def package_info(self): @@
             self.cpp_info.defines.append(f"LIBNEST2D_THREADING_{self.options.threading}")
             if self.settings.os in ["Linux", "FreeBSD", "Macos"] and self.options.threading == "std":
                 self.cpp_info.system_libs.append("pthread")
+            # npm package json for Emscripten builds
+            if self.settings.os == "Emscripten" or self.options.get_safe("with_js_bindings", False):
+                self.python_requires["npmpackage"].module.conf_package_json(self)
+                # Expose the path to the JS/WASM assets for consumers
+                js_asset_path = os.path.join(self.package_folder, "bin")
+                self.conf_info.define("user.nest2d:js_path", js_asset_path)

include/libnest2d/parallel.hpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     #endif
     namespace libnest2d { namespace __parallel {
     template<class It>
     using TIteratorValue = typename std::iterator_traits<It>::value_type;
@@ Expand Down Expand Up / @@ -56,8 +56,14 @@ inline void enumerate( @@
         for(TN fi = 0; fi < N; ++fi) rets[fi].wait();
     #endif
+    #ifdef __EMSCRIPTEN__
+        // For WASM/Emscripten builds, always use non-parallel execution
+        // due to limited threading support in WebAssembly
+        for(TN n = 0; n < N; n++) fn(*(from + n), n);
+    #endif
     }
     }}
-    #endif //LIBNEST2D_PARALLEL_HPP
+    #endif //LIBNEST2D_PARALLEL_HPP

libnest2d_js/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,64 @@
+    message(STATUS "Building for Emscripten")
+    cmake_minimum_required(VERSION 3.10)
+    project(libnest2d_js)
+    add_executable(libnest2d_js libnest2d_js.cpp)
+    if (NOT CMAKE_CXX_PLATFORM_ID STREQUAL "emscripten")
+        use_threads(libnest2d_js)
+    endif ()
+    # Emscripten bindings
+    set_target_properties(libnest2d_js PROPERTIES LINK_FLAGS "--bind")
+    # Find Clipper library (required for polyclipping/clipper.hpp)
+    find_package(clipper REQUIRED)
+    # Find Boost library (required for boost/geometry.hpp)
+    find_package(Boost REQUIRED)
+    find_package(NLopt REQUIRED)
+    # Include directories
+    target_include_directories(libnest2d_js PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}/../include
+            ${CMAKE_CURRENT_SOURCE_DIR}/../src
+            ${clipper_INCLUDE_DIRS}
+            ${Boost_INCLUDE_DIRS}
+    )
+    # Link Boost headers
+    target_link_libraries(libnest2d_js PRIVATE Boost::headers)
+    # Link Clipper library
+    target_link_libraries(libnest2d_js PRIVATE clipper::clipper)
+    target_link_libraries(libnest2d_js PRIVATE NLopt::nlopt)
+    target_link_libraries(libnest2d_js PUBLIC spdlog::spdlog)
+    # Define backend macro for Emscripten
+    target_compile_definitions(libnest2d_js PRIVATE LIBNEST2D_GEOMETRIES_clipper)
+    target_compile_definitions(libnest2d_js PRIVATE LIBNEST2D_OPTIMIZER_nlopt)
+    # Emscripten-specific options (optional, but recommended)
+    target_link_options(libnest2d_js
+            PUBLIC
+            "SHELL:-s USE_ES6_IMPORT_META=1"
+            "SHELL:-s FORCE_FILESYSTEM=1"
+            "SHELL:-s EXPORT_NAME=libnest2d_js"
+            "SHELL:-s MODULARIZE=1"
+            "SHELL:-s EXPORT_ES6=1"
+            "SHELL:-s SINGLE_FILE=1"
+            "SHELL:-s ALLOW_MEMORY_GROWTH=1"
+            "SHELL:-s ERROR_ON_UNDEFINED_SYMBOLS=0"
+            "SHELL:--bind"
+            "SHELL:-l embind"
+            "SHELL: --emit-tsd libnest2d_js.d.ts"
+            "SHELL:-sWASM_BIGINT=1"
+            "SHELL:-sASSERTIONS=1"
+    )
+    # If you want to enable debug options, add them conditionally:
+    # $<$<CONFIG:Debug>:SHELL:-g3>
+    # $<$<CONFIG:Debug>:SHELL:-gsource-map>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Np 1172 wasm bindings #12

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!