Skip to content

Commit d6a132b

Browse files
committed
Adds -fopenmp flag to omp kernels + adds c++20 omp kernel
1 parent f20af56 commit d6a132b

File tree

5 files changed

+49
-0
lines changed

5 files changed

+49
-0
lines changed

CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ function(configure_kernel kernel)
132132
set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR})
133133
set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
134134

135+
if(${kernel} MATCHES "omp/$")
136+
set(XEUS_CPP_OMP "-fopenmp")
137+
endif()
138+
135139
if (WIN32)
136140
string(REPLACE "\\" "/" kernel "${kernel}")
137141
string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
@@ -162,7 +166,9 @@ message("Configure kernels: ...")
162166
configure_kernel("/share/jupyter/kernels/xcpp11/")
163167
configure_kernel("/share/jupyter/kernels/xcpp14/")
164168
configure_kernel("/share/jupyter/kernels/xcpp17/")
169+
configure_kernel("/share/jupyter/kernels/xcpp17-omp/")
165170
configure_kernel("/share/jupyter/kernels/xcpp20/")
171+
configure_kernel("/share/jupyter/kernels/xcpp20-omp/")
166172

167173
# Source files
168174
# ============
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"display_name": "C++20 (xcpp+OpenMP)",
3+
"env": {
4+
"PATH":"@XEUS_CPP_PATH@",
5+
"LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
6+
},
7+
"argv": [
8+
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
9+
"-f",
10+
"{connection_file}",
11+
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
12+
"-I", "@XEUS_CPP_INCLUDE_DIR@",
13+
"-std=c++20"@XEUS_CPP_OMP@
14+
],
15+
"language": "cpp",
16+
"metadata": {"debugger": false
17+
}
18+
}
1.48 KB
Loading
3.04 KB
Loading
Loading

0 commit comments

Comments
 (0)