Skip to content

Commit

Permalink
Adds -fopenmp flag to omp kernels + adds c++20 omp kernel
Browse files Browse the repository at this point in the history
  • Loading branch information
mcbarton committed May 16, 2024
1 parent f20af56 commit 658ebae
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ function(configure_kernel kernel)
set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR})
set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)

if(${kernel} MATCHES "omp/$")
set(XEUS_CPP_OMP "-fopenmp")
endif()

if (WIN32)
string(REPLACE "\\" "/" kernel "${kernel}")
string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
Expand Down Expand Up @@ -162,7 +166,9 @@ message("Configure kernels: ...")
configure_kernel("/share/jupyter/kernels/xcpp11/")
configure_kernel("/share/jupyter/kernels/xcpp14/")
configure_kernel("/share/jupyter/kernels/xcpp17/")
configure_kernel("/share/jupyter/kernels/xcpp17-omp/")
configure_kernel("/share/jupyter/kernels/xcpp20/")
configure_kernel("/share/jupyter/kernels/xcpp20-omp/")

# Source files
# ============
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp11/kernel.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"{connection_file}",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-I", "@XEUS_CPP_INCLUDE_DIR@",
"-std=c++11"@XEUS_CPP_OMP@
"-std=c++11","@XEUS_CPP_OMP@"
],
"language": "cpp",
"metadata": {"debugger": false}
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp14/kernel.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"-std=c++14",
"-fno-exceptions",
"-O2",
"-v"@XEUS_CPP_OMP@
"-v","@XEUS_CPP_OMP@"
],
"language": "cpp",
"metadata": {"debugger": false}
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp17-omp/kernel.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"{connection_file}",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-I", "@XEUS_CPP_INCLUDE_DIR@",
"-std=c++17"@XEUS_CPP_OMP@
"-std=c++17","@XEUS_CPP_OMP@"
],
"language": "cpp",
"metadata": {"debugger": false
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp17/kernel.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"{connection_file}",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-I", "@XEUS_CPP_INCLUDE_DIR@",
"-std=c++17"@XEUS_CPP_OMP@
"-std=c++17","@XEUS_CPP_OMP@"
],
"language": "cpp",
"metadata": {"debugger": false
Expand Down
18 changes: 18 additions & 0 deletions share/jupyter/kernels/xcpp20-omp/kernel.json.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"display_name": "C++20 (xcpp+OpenMP)",
"env": {
"PATH":"@XEUS_CPP_PATH@",
"LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
},
"argv": [
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
"-f",
"{connection_file}",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-I", "@XEUS_CPP_INCLUDE_DIR@",
"-std=c++20","@XEUS_CPP_OMP@"
],
"language": "cpp",
"metadata": {"debugger": false
}
}
Binary file added share/jupyter/kernels/xcpp20-omp/logo-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/jupyter/kernels/xcpp20-omp/logo-64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions share/jupyter/kernels/xcpp20-omp/logo-svg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp20/kernel.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"{connection_file}",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-I", "@XEUS_CPP_INCLUDE_DIR@",
"-std=c++20"@XEUS_CPP_OMP@
"-std=c++20","@XEUS_CPP_OMP@"
],
"language": "cpp",
"metadata": {"debugger": false
Expand Down

0 comments on commit 658ebae

Please sign in to comment.