Skip to content

Switch to a shared xeus for the emscripten build #657

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.

Sign up for GitHub

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
merged 2 commits into from
Jul 9, 2025
Merged

Switch to a shared xeus for the emscripten build #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5449cec
Switch to xeus shared build
anutosh491 Jul 1, 2025
37c351b
Add wasm_kernel.json.in
anutosh491 Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,23 @@ if(EMSCRIPTEN)
STRING(REGEX MATCH "python[0-9]+[.][0-9]+" PYTHON_VERSION_STRING ${WASM_PYTHON_LIBRARY})
STRING(REGEX MATCH "[0-9]+" PYTHON_VERSION_MAJOR ${PYTHON_VERSION_STRING})
STRING(REGEX MATCH "[0-9]+$" PYTHON_VERSION_MINOR ${PYTHON_VERSION_STRING})

configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/wasm_kernel.json.in"
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json"
)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fetching xeus-python from emscripten-forge, I see that we're only interested in the xpython build and not xpython-raw so we can skip configuring it for the wasm use case.

else()
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json.in"
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json"
)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json.in"
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json"
)
endif()

configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json.in"
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json"
)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json.in"
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json"
)


# Build options
# =============
Expand Down Expand Up @@ -88,12 +95,12 @@ if(EMSCRIPTEN)
cat(wasm_patches/post.js post.js.in)

add_compile_definitions(XPYT_EMSCRIPTEN_WASM_BUILD)
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)

set(XPYT_BUILD_STATIC OFF)
set(XPYT_BUILD_SHARED OFF)
set(XPYT_BUILD_XPYTHON_EXECUTABLE OFF)
set(XPYT_BUILD_XPYTHON_EXTENSION OFF)
set(XPYT_USE_SHARED_XEUS OFF)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is enough to link with libxeus.so (ON by default)

set(XPYT_USE_SHARED_XEUS_PYTHON OFF)
set(XPYT_BUILD_TESTS OFF)
endif()
Expand Down
13 changes: 13 additions & 0 deletions share/jupyter/kernels/xpython/wasm_kernel.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"display_name": "Python @PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ (XPython)",
"argv": [
"@XPYTHON_KERNELSPEC_PATH@xpython"
],
"language": "python",
"metadata": {
"debugger": false,
"shared": {
"libxeus.so": "lib/libxeus.so"
}
}
}
Loading