Skip to content

Commit fec4a75

Browse files
committed
Update cmake to configure added c++ + openmp kernels + add llvm-openmp to native conda environment
1 parent e1f3751 commit fec4a75

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ endif()
107107

108108
find_package(argparse REQUIRED)
109109
find_package(pugixml REQUIRED)
110+
find_package(OpenMP)
110111

111112
# Configuration
112113
# =============
@@ -127,6 +128,9 @@ function(configure_kernel kernel)
127128
set(XEUS_CPP_PATH "$ENV{PATH}")
128129
set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
129130
set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
131+
if(${kernel} MATCHES "omp/$")
132+
set(XEUS_CPP_OMP "${OpenMP_CXX_FLAGS}")
133+
endif()
130134
endif()
131135
if (WIN32)
132136
string(REPLACE "\\" "/" kernel "${kernel}")
@@ -163,6 +167,11 @@ configure_kernel("/share/jupyter/kernels/xcpp23/")
163167
configure_kernel("/share/jupyter/kernels/xc11/")
164168
configure_kernel("/share/jupyter/kernels/xc17/")
165169
configure_kernel("/share/jupyter/kernels/xc23/")
170+
if(NOT EMSCRIPTEN)
171+
configure_kernel("/share/jupyter/kernels/xcpp17-omp/")
172+
configure_kernel("/share/jupyter/kernels/xcpp20-omp/")
173+
configure_kernel("/share/jupyter/kernels/xcpp23-omp/")
174+
endif()
166175

167176
# Source files
168177
# ============

environment-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
- CppInterOp
1515
- pugixml
1616
- cpp-argparse
17+
- llvm-openmp
1718
# Test dependencies
1819
- pytest
1920
- jupyter_kernel_test<0.8

0 commit comments

Comments
 (0)