Attempt to fix wasm build

Author: anutosh491

.github/workflows/main.yml

@@ -89,7 +89,7 @@ jobs:
           call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp
           mkdir -p bld
           cd bld
-          cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DXEUS_BUILD_TESTS=ON -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%" 
+          cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DXEUS_BUILD_TESTS=ON -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
 
       - name: build
         shell: cmd
@@ -106,104 +106,14 @@ jobs:
           cd test
           pytest .  --reruns 5
 
-  emscripten_wasm_docker:
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        container: ["emscripten/emsdk:2.0.34", "emscripten/emsdk:3.1.3", "emscripten/emsdk:latest"]
-
-    
-    container: ${{ matrix.container}}
-     
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Verify emscripten
-        run: emcc -v
-
-      - name: "install xtl"
-        run: |
-          mkdir -p /opt/xtl/build 
-          git clone https://github.com/xtensor-stack/xtl.git  /opt/xtl/src
-          cd /opt/xtl/src 
-          git checkout 0.7.2
-          cd /opt/xtl/build 
-          emcmake cmake ../src/ -DCMAKE_INSTALL_PREFIX=/custom_sysroot
-          emmake make -j2 install
-
-      - name: "install nlohmann-json"
-        run: |
-          mkdir -p /opt/nlohmannjson/build 
-          git clone https://github.com/nlohmann/json.git  /opt/nlohmannjson/src
-          cd  /opt/nlohmannjson/src
-          git checkout v3.9.0
-          cd /opt/nlohmannjson/build 
-          emcmake cmake ../src/  -DJSON_BuildTests=OFF -DCMAKE_INSTALL_PREFIX=/custom_sysroot
-          emmake make -j2 install
-
-      - name: "install xeus"
-        run: |
-          mkdir -p /opt/xeus/build 
-          git clone https://github.com/jupyter-xeus/xeus.git  /opt/xeus/src
-          cd /opt/xeus/build 
-          emcmake cmake ../src \
-            -DXEUS_EMSCRIPTEN_WASM_BUILD=ON \
-            -DCMAKE_INSTALL_PREFIX=/custom_sysroot\
-            -Dxtl_DIR=/custom_sysroot/share/cmake/xtl \
-            -Dnlohmann_json_DIR=/custom_sysroot/lib/cmake/nlohmann_json 
-
-          emmake make -j2
-          emmake make -j2 install
-
-      - name: "install xeus-lite"
-        run: |
-          mkdir -p /opt/xeus-lite/build 
-          git clone https://github.com/jupyter-xeus/xeus-lite.git  /opt/xeus-lite/src
-          cd /opt/xeus-lite/build 
-          emcmake cmake ../src \
-            -DXEUS_EMSCRIPTEN_WASM_BUILD=ON \
-            -DCMAKE_INSTALL_PREFIX=/custom_sysroot \
-            -Dxtl_DIR=/custom_sysroot/share/cmake/xtl \
-            -Dnlohmann_json_DIR=/custom_sysroot/lib/cmake/nlohmann_json \
-            -Dxeus_DIR=/custom_sysroot/lib/cmake/xeus
-          emmake make -j2
-          emmake make -j2 install
-
-      - name: cmake configure rendered project
-        shell: bash -l {0}
-        run: |
-          mkdir -p bld
-          cd bld
-          emcmake cmake .. \
-           -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
-           -Dxtl_DIR=/custom_sysroot/share/cmake/xtl \
-           -Dnlohmann_json_DIR=/custom_sysroot/lib/cmake/nlohmann_json \
-           -Dxeus_DIR=/custom_sysroot/lib/cmake/xeus \
-           -Dxeus-lite_DIR=/custom_sysroot/lib/cmake/xeus-lite \
-           -DCMAKE_INSTALL_PREFIX=/custom_sysroot
-
-      - name: build rendered project
-        shell: bash -l {0}
-        run: |
-          cd bld
-          emmake make -j2
-
-      - name: install rendered project
-        shell: bash -l {0}
-        run: |
-          cd bld
-          make install
-
   emscripten_wasm:
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        emsdk_ver: ["2.0.34", "3.1.3"]
+        emsdk_ver: ["3.1.45"]
 
     steps:
       - uses: actions/checkout@v2
@@ -224,7 +134,7 @@ jobs:
         run: |
           emsdk activate ${{matrix.emsdk_ver}}
           source $CONDA_EMSDK_DIR/emsdk_env.sh
-          micromamba create -f environment-wasm-host.yml --platform=emscripten-32
+          micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
           
           mkdir build
           pushd build
@@ -241,4 +151,4 @@ jobs:
             -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON               \
             -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON            \
             ..
-          make -j5
+          EMCC_CFLAGS='-sERROR_ON_UNDEFINED_SYMBOLS=0' emmake make -j5

CMakeLists.txt

@@ -295,8 +295,8 @@ if(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)
     include(WasmBuildOptions)
     find_package(xeus-lite REQUIRED)
     add_executable(xcpp_wasm src/main_emscripten_kernel.cpp )
-    target_link_libraries(xcpp_wasm PRIVATE xeus-cpp-static xeus-lite)
-    XEUS_CPP_set_kernel_options(xcpp_wasm)
+    target_link_libraries(xcpp_wasm PRIVATE xeus-lite)
+    xeus_cpp_set_kernel_options(xcpp_wasm)
     xeus_wasm_compile_options(xcpp_wasm)
     xeus_wasm_link_options(xcpp_wasm "web,worker")
 endif()

environment-wasm-host.yml

@@ -7,3 +7,6 @@ dependencies:
   - xeus-lite
   - xeus >=3.0.5,<4.0
   - xtl >=0.7,<0.8
+  - llvm =16.0.6
+  - cpp-argparse
+  - pugixml

include/xeus-cpp/xinterpreter_wasm.hpp

@@ -0,0 +1,32 @@
+/************************************************************************************
+ * Copyright (c) 2023, xeus-cpp contributors                                        *
+ * Copyright (c) 2023, Johan Mabille, Loic Gouarin, Sylvain Corlay, Wolf Vollprecht *
+ *                                                                                  *
+ * Distributed under the terms of the BSD 3-Clause License.                         *
+  *                                                                                 *
+ * The full license is in the file LICENSE, distributed with this software.         *
+ ************************************************************************************/
+
+
+#ifndef XEUS_CPP_INTERPRETER_WASM_HPP
+#define XEUS_CPP_INTERPRETER_WASM_HPP
+
+#include "xinterpreter.hpp"
+#include "xeus_cpp_config.hpp"
+
+namespace xcpp
+{
+    class XEUS_CPP_API wasm_interpreter : public interpreter
+    {
+    public:
+
+        wasm_interpreter();
+        virtual ~wasm_interpreter();
+
+    private:
+
+        void configure_impl() override;
+    };
+}
+
+#endif

src/main_emscripten_kernel.cpp

@@ -13,11 +13,11 @@
 
 #include <xeus/xembind.hpp>
 
-#include "xeus-cpp/xinterpreter.hpp"
+#include "xeus-cpp/xinterpreter_wasm.hpp"
 
 EMSCRIPTEN_BINDINGS(my_module)
 {
     xeus::export_core();
-    using interpreter_type = xcpp::interpreter;
+    using interpreter_type = xcpp::wasm_interpreter;
     xeus::export_kernel<interpreter_type>("xkernel");
 }

src/xinterpreter_wasm.cpp

@@ -0,0 +1,30 @@
+/************************************************************************************
+ * Copyright (c) 2023, xeus-cpp contributors                                        *
+ * Copyright (c) 2023, Martin Vassilev                                              *
+ *                                                                                  *
+ * Distributed under the terms of the BSD 3-Clause License.                         *
+ *                                                                                  *
+ * The full license is in the file LICENSE, distributed with this software.         *
+ ************************************************************************************/
+
+#include "xeus/xinterpreter.hpp"
+#include "xeus/xsystem.hpp"
+
+#include "xeus-cpp/xinterpreter.hpp"
+#include "xeus-cpp/xinterpreter_wasm.hpp"
+
+namespace xcpp
+{
+
+    wasm_interpreter::wasm_interpreter()
+        : interpreter(0, nullptr)
+
+    wasm_interpreter::~wasm_interpreter()
+    {
+    }
+
+    void wasm_interpreter::configure_impl()
+    {
+        interpreter::configure_impl();
+    }
+}