Merge branch 'main' into undo

Author: kr-2003

.github/workflows/deploy-github-page.yml

@@ -61,6 +61,7 @@ jobs:
             -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON               \
             -DCMAKE_FIND_ROOT_PATH=$PREFIX                    \
             -DSYSROOT_PATH=$SYSROOT_PATH                      \
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON            \
             ..
           emmake make -j ${{ env.ncpus }} install
 
@@ -74,6 +75,7 @@ jobs:
               --XeusAddon.prefix=${{ env.PREFIX }} \
               --contents README.md \
               --contents notebooks/xeus-cpp-lite-demo.ipynb \
+              --contents notebooks/smallpt.ipynb \
               --contents notebooks/images/marie.png \
               --contents notebooks/audio/audio.wav \
               --output-dir dist

.github/workflows/main.yml

@@ -244,6 +244,7 @@ jobs:
             -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON               \
             -DCMAKE_FIND_ROOT_PATH=$PREFIX                    \
             -DSYSROOT_PATH=$SYSROOT_PATH                      \
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON            \
             ..
           emmake make -j ${{ env.ncpus }} install
 

CMakeLists.txt

@@ -148,6 +148,7 @@ function(configure_native_kernel kernel)
 endfunction()
 
 function(configure_wasm_kernel kernel)
+  set(XEUS_CPP_RESOURCE_DIR "/lib/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}" PARENT_SCOPE)
 
   configure_file (
     "${CMAKE_CURRENT_SOURCE_DIR}${kernel}wasm_kernel.json.in"
@@ -169,17 +170,9 @@ endfunction()
 
 message("Configure kernels: ...")
 if(EMSCRIPTEN)
-    # TODO: Currently jupyterlite-xeus and xeus-lite do not provide
-    # methods to fetch information from the arguments present in the
-    # generated emscripten kernel.
-    # The following needs to be done here :
-    # 1) We need to configure the kernel properly
-    #    Check issue https://github.com/compiler-research/xeus-cpp/issues/185.
-    # 2) Once the above is done we need to add support in jupyterlite-xeus & xeus-lite
-    #    to be able to deal with arguments present in kernel.json
-    # 3) Finally we should fetch the C++ version from the kernel.json file and
-    #    be able to pass it to our wasm interpreter rather than forcing a version.
+    configure_wasm_kernel("/share/jupyter/kernels/xcpp17/")
     configure_wasm_kernel("/share/jupyter/kernels/xcpp20/")
+    configure_wasm_kernel("/share/jupyter/kernels/xcpp23/")
 else()
     configure_native_kernel("/share/jupyter/kernels/xcpp17/")
     configure_native_kernel("/share/jupyter/kernels/xcpp20/")
@@ -443,21 +436,15 @@ if(EMSCRIPTEN)
     xeus_wasm_compile_options(xcpp)
     xeus_wasm_link_options(xcpp "web,worker")
     target_link_options(xcpp
+        PUBLIC "SHELL: -s USE_SDL=2"
         PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
+        #PUBLIC "SHELL: --preload-file ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}@${XEUS_CPP_RESOURCE_DIR}"
         PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"
         PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
         PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"
     )
-    # TODO: Emscripten supports preloading files just once before it generates
-    # the xcpp.data file (containing the binary representation of the file(s) we
-    # want to include in our application).
-    # Hence although we are adding support for Standard Headers, Libraries etc
-    # through emscripten's sysroot for now, we need to do the following:
-    # 1) Enable CppInterOp to provide us with a resource dir.
-    # 2) If the above cannot be done, we can use the resource dir provided
-    #    by llvm on emscripten-forge but would involve adding a dependency.
-    # 3) Shift the resource dir and the sysroot to a common location.
-    # 4) Preload everything required together.
+    # TODO: Uncomment the above line regarding preloading clang's resource dir
+    # once has been supported through cppinterop.
 endif()
 # Tests
 # =====

CONTRIBUTING.md

@@ -18,7 +18,7 @@ minutes of past meetings can be found on our
 ## Setting up a development environment
 
 First, you need to fork the project. After you have done this clone your forked repo. You can do this by 
-executing the folowing
+executing the following
 
 ```bash
 git clone https://github.com/<your-github-username>/xeus-cpp.git
@@ -35,7 +35,7 @@ micromamba create -f environment-dev.yml -y
 micromamba activate xeus-cpp
 ```
 
-You are now in a position to install xeus-cpp into this envirnoment. You can do this by executing
+You are now in a position to install xeus-cpp into this environment. You can do this by executing
 
 ```bash
 mkdir build
@@ -61,7 +61,7 @@ pytest -sv test_xcpp_kernel.py
 ## Setting up a development environment (wasm instructions)
 
 First, you need to fork the project. After you have done this clone your forked repo. You can do this by 
-executing the folowing
+executing the following
 
 ```bash
 git clone https://github.com/<your-github-username>/xeus-cpp.git

docs/source/InstallationAndUsage.rst

@@ -100,7 +100,7 @@ Once the Jupyter Lite site has built you can test the website locally by executi
 Installing from conda-forge
 ===========================
 
-If you have conda installed then you can install xeus-cpp using the follwing command
+If you have conda installed then you can install xeus-cpp using the following command
 
 .. code-block:: bash
 

docs/source/index.rst

@@ -12,7 +12,11 @@ Introduction
 ------------
 
 ``xeus-cpp`` is a Jupyter kernel for cpp based on the native implementation of
-the Jupyter protocol xeus_.
+the Jupyter protocol xeus_. Try a Jupyter Lite demo of xeus-cpp by clicking
+
+.. image:: https://jupyterlite.rtfd.io/en/latest/_static/badge.svg
+   :target: https://compiler-research.github.io/xeus-cpp/lab/index.html
+   :alt: lite-badge
 
 Licensing
 ---------
@@ -40,4 +44,4 @@ The Xeus-Cpp is a Jupyter kernel for the C++ programming language
    FAQ
    reference
 
-.. _xeus: https://github.com/jupyter-xeus/xeus
+.. _xeus: https://github.com/jupyter-xeus/xeus

include/xeus-cpp/xinterpreter_wasm.hpp

@@ -19,7 +19,7 @@ namespace xcpp
     {
     public:
 
-        wasm_interpreter();
+        wasm_interpreter(int argc = 0, char** argv = nullptr);
         virtual ~wasm_interpreter() = default;
 
     };

include/xeus-cpp/xutils.hpp

@@ -24,9 +24,6 @@ namespace xcpp
     XEUS_CPP_API
     void stop_handler(int sig);
 
-    XEUS_CPP_API
-    interpreter_ptr build_interpreter(int argc, char** argv);
-
     XEUS_CPP_API
     std::string retrieve_tagconf_dir();