Add OpenMP kernels

mcbarton · mcbarton · commit 25a8085d3bd2 · 2024-05-22T15:24:58.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -95,6 +95,10 @@ jobs:
         run: |
           mkdir -p build
           cd build
+          export LD_LIBRARY_PATH="$CONDA_PREFIX/lib:$LD_LIBRARY_PATH"
+          echo $LD_LIBRARY_PATH
+          find "$CONDA_PREFIX/lib"
+          find "$CONDA_PREFIX/include/"
           cmake .. \
            -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
            -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,7 +123,7 @@ endif()
 
 find_package(argparse REQUIRED)
 find_package(pugixml REQUIRED)
-
+find_package(OpenMP)
 # Configuration
 # =============
 
@@ -135,8 +135,15 @@ function(configure_kernel kernel)
   set(XEUS_CPP_PATH "$ENV{PATH}")
   set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
   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)
+  set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/)
+
+  if(${kernel} MATCHES "omp/$")
+    set(XEUS_CPP_OMP "${OpenMP_CXX_FLAGS}")
+  endif()
 
+  message(Configure_Kernel "${kernel}")
+  message(CPP_OMP_FLAG "${XEUS_CPP_OMP}")
+  message(CPP_INCLUDE_DIR "${XEUS_CPP_INCLUDE_DIR}")
   if (WIN32)
     string(REPLACE "\\" "/" kernel "${kernel}")
     string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
@@ -167,7 +174,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
 # ============
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -20,4 +20,6 @@ dependencies:
   - jupyter_kernel_test>=0.4.3
   - nbval
   - pytest-rerunfailures
-  - doctest
+  - doctest
+  - llvm 
+  - llvm-openmp
diff --git a/share/jupyter/kernels/xcpp11/kernel.json.in b/share/jupyter/kernels/xcpp11/kernel.json.in
@@ -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}
diff --git a/share/jupyter/kernels/xcpp14/kernel.json.in b/share/jupyter/kernels/xcpp14/kernel.json.in
@@ -13,7 +13,7 @@
       "-std=c++14",
       "-fno-exceptions",
       "-O2",
-      "-v"@XEUS_CPP_OMP@
+      "-v","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false}
diff --git a/share/jupyter/kernels/xcpp17-omp/kernel.json.in b/share/jupyter/kernels/xcpp17-omp/kernel.json.in
@@ -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
diff --git a/share/jupyter/kernels/xcpp17/kernel.json.in b/share/jupyter/kernels/xcpp17/kernel.json.in
@@ -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
diff --git a/share/jupyter/kernels/xcpp20-omp/kernel.json.in b/share/jupyter/kernels/xcpp20-omp/kernel.json.in
@@ -0,0 +1,19 @@
+{
+  "display_name": "C++20 (xcpp+OpenMP)",
+  "env": {
+      "PATH":"@XEUS_CPP_PATH@",
+      "LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@",
+      "CPLUS_INCLUDE_PATH":"@CMAKE_CPLUS_INCLUDE_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
+  }
+}
diff --git a/share/jupyter/kernels/xcpp20-omp/logo-32x32.png b/share/jupyter/kernels/xcpp20-omp/logo-32x32.png
diff --git a/share/jupyter/kernels/xcpp20-omp/logo-64x64.png b/share/jupyter/kernels/xcpp20-omp/logo-64x64.png
diff --git a/share/jupyter/kernels/xcpp20-omp/logo-svg.svg b/share/jupyter/kernels/xcpp20-omp/logo-svg.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="306px" height="344.35px" viewBox="0 0 306 344.35" enable-background="new 0 0 306 344.35" xml:space="preserve">
+<path fill="#00599C" d="M302.107,258.262c2.401-4.159,3.893-8.845,3.893-13.053V99.14c0-4.208-1.49-8.893-3.892-13.052L153,172.175
+	L302.107,258.262z"/>
+<path fill="#004482" d="M166.25,341.193l126.5-73.034c3.644-2.104,6.956-5.737,9.357-9.897L153,172.175L3.893,258.263
+	c2.401,4.159,5.714,7.793,9.357,9.896l126.5,73.034C147.037,345.401,158.963,345.401,166.25,341.193z"/>
+<path fill="#659AD2" d="M302.108,86.087c-2.402-4.16-5.715-7.793-9.358-9.897L166.25,3.156c-7.287-4.208-19.213-4.208-26.5,0
+	L13.25,76.19C5.962,80.397,0,90.725,0,99.14v146.069c0,4.208,1.491,8.894,3.893,13.053L153,172.175L302.108,86.087z"/>
+<g>
+	<path fill="#FFFFFF" d="M153,274.175c-56.243,0-102-45.757-102-102s45.757-102,102-102c36.292,0,70.139,19.53,88.331,50.968
+		l-44.143,25.544c-9.105-15.736-26.038-25.512-44.188-25.512c-28.122,0-51,22.878-51,51c0,28.121,22.878,51,51,51
+		c18.152,0,35.085-9.776,44.191-25.515l44.143,25.543C223.142,254.644,189.294,274.175,153,274.175z"/>
+</g>
+<g>
+	<polygon fill="#FFFFFF" points="255,166.508 243.666,166.508 243.666,155.175 232.334,155.175 232.334,166.508 221,166.508 
+		221,177.841 232.334,177.841 232.334,189.175 243.666,189.175 243.666,177.841 255,177.841 	"/>
+</g>
+<g>
+	<polygon fill="#FFFFFF" points="297.5,166.508 286.166,166.508 286.166,155.175 274.834,155.175 274.834,166.508 263.5,166.508 
+		263.5,177.841 274.834,177.841 274.834,189.175 286.166,189.175 286.166,177.841 297.5,177.841 	"/>
+</g>
+</svg>
diff --git a/share/jupyter/kernels/xcpp20/kernel.json.in b/share/jupyter/kernels/xcpp20/kernel.json.in
@@ -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
diff --git a/test/test_xcpp_kernel.py b/test/test_xcpp_kernel.py
@@ -70,7 +70,7 @@ def test_continuation(self) -> None:
 if platform.system() != 'Windows':
     class XCppTests(jupyter_kernel_test.KernelTests):
 
-        kernel_name = 'xcpp20'
+        kernel_name = 'xcpp20-omp'
 
         # language_info.name in a kernel_info_reply should match this
         language_name = 'C++'
@@ -131,6 +131,29 @@ class XCppTests(jupyter_kernel_test.KernelTests):
                 'mime': 'image/png'
             }
         ]
+        code_omp="""
+    #include <omp.h>
+    #include <iostream>
+    #include <clang/Interpreter/CppInterOp.h>  
+    #include "llvm/Support/FileSystem.h"
+    #include "llvm/Support/Path.h"
+    std::string BinaryPath = GetExecutablePath(/*Argv0=*/nullptr);
+    llvm::StringRef Dir = llvm::sys::path::parent_path(BinaryPath);
+    Cpp::AddSearchPath(Dir.str().c_str());
+    #ifdef __APPLE__
+      std::string PathToTestSharedLib = Cpp::SearchLibrariesForSymbol("_omp_get_max_threads_", /*system_search=*/false);
+    #else
+      std::string PathToTestSharedLib = Cpp::SearchLibrariesForSymbol("omp_get_max_threads_", /*system_search=*/false);
+    #endif // __APPLE__
+    bool loaded=Cpp::LoadLibrary("PathToTestSharedLib.c_str())");
+    std::cerr<<loaded<<std::endl;
+    """
+        def test_xcpp_omp(self):
+            self.flush_channels()
+            reply, output_msgs = self.execute_helper(code=self.code_omp,timeout=20)
+            self.assertEqual(output_msgs[0]['msg_type'], 'stream')
+            self.assertEqual(output_msgs[0]['content']['name'], 'stderr')
+            self.assertEqual(output_msgs[0]['content']['text'], '2')  
 
 
 class XCppTests2(jupyter_kernel_test.KernelTests):
@@ -145,4 +168,4 @@ class XCppTests2(jupyter_kernel_test.KernelTests):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()
