[test additional commit] Adding OpenMP Kernels + explicitly load libomp.so

CMakeLists.txt

@@ -107,6 +107,13 @@ endif()
 
 find_package(argparse REQUIRED)
 find_package(pugixml REQUIRED)
+find_package(OpenMP)
+
+# Used to configure OpenMP kernels such that Cpp::loadlibrary knows where OpenMP library is
+if (NOT WIN32)
+  list(GET OpenMP_CXX_LIBRARIES 0 FirstOpenMPLibrary)
+  get_filename_component(OpenMPLibraryDir "${FirstOpenMPLibrary}" DIRECTORY)
+endif()
 
 # Configuration
 # =============
@@ -127,6 +134,9 @@ function(configure_kernel kernel)
     set(XEUS_CPP_PATH "$ENV{PATH}")
     set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
     set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
+    if(${kernel} MATCHES "omp/$")
+      set(XEUS_CPP_OMP "${OpenMP_CXX_FLAGS}")
+    endif()
   endif()
   if (WIN32)
     string(REPLACE "\\" "/" kernel "${kernel}")
@@ -163,6 +173,14 @@ configure_kernel("/share/jupyter/kernels/xcpp23/")
 configure_kernel("/share/jupyter/kernels/xc11/")
 configure_kernel("/share/jupyter/kernels/xc17/")
 configure_kernel("/share/jupyter/kernels/xc23/")
+if(NOT EMSCRIPTEN)
+  configure_kernel("/share/jupyter/kernels/xcpp17-omp/")
+  configure_kernel("/share/jupyter/kernels/xcpp20-omp/")
+  configure_kernel("/share/jupyter/kernels/xcpp23-omp/")
+  configure_kernel("/share/jupyter/kernels/xc11-omp/")
+  configure_kernel("/share/jupyter/kernels/xc17-omp/")
+  configure_kernel("/share/jupyter/kernels/xc23-omp/")
+endif()
 
 # Source files
 # ============

environment-dev.yml

@@ -14,6 +14,7 @@ dependencies:
   - CppInterOp
   - pugixml
   - cpp-argparse
+  - llvm-openmp
   # Test dependencies
   - pytest
   - jupyter_kernel_test<0.8

notebooks/openmp-notebooks/hello_world.ipynb

@@ -0,0 +1,89 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "73cbab37-71dd-477d-981b-f2ec28c01bd6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#include <stdio.h>\n",
+    "#include <omp.h>"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "c2b754ad-9553-4a42-b990-f990a9a269ed",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "int main() {\n",
+    "    int max_threads = omp_get_max_threads();\n",
+    "\n",
+    "    printf(\"max threads: %d\\n\", max_threads);\n",
+    "    omp_set_num_threads(max_threads);\n",
+    "\n",
+    "#pragma omp parallel\n",
+    "    {\n",
+    "        int id = omp_get_thread_num();\n",
+    "        printf(\"Hello World from thread = %d with %d threads\\n\", id, omp_get_num_threads());\n",
+    "    }\n",
+    "\n",
+    "    printf(\"all done, with hopefully %d threads\\n\", max_threads);\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "a37a13d4-fc82-496e-8f42-9e718a8c2aa0",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "max threads: 16\n",
+      "Hello World from thread = 0 with 16 threads\n",
+      "Hello World from thread = 3 with 16 threads\n",
+      "Hello World from thread = 13 with 16 threads\n",
+      "Hello World from thread = 4 with 16 threads\n",
+      "Hello World from thread = 12 with 16 threads\n",
+      "Hello World from thread = 1 with 16 threads\n",
+      "Hello World from thread = 14 with 16 threads\n",
+      "Hello World from thread = 15 with 16 threads\n",
+      "Hello World from thread = 8 with 16 threads\n",
+      "Hello World from thread = 6 with 16 threads\n",
+      "Hello World from thread = 11 with 16 threads\n",
+      "Hello World from thread = 5 with 16 threads\n",
+      "Hello World from thread = 7 with 16 threads\n",
+      "Hello World from thread = 10 with 16 threads\n",
+      "Hello World from thread = 9 with 16 threads\n",
+      "Hello World from thread = 2 with 16 threads\n",
+      "all done, with hopefully 16 threads\n"
+     ]
+    }
+   ],
+   "source": [
+    "main();"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "C++17 + OpenMP",
+   "language": "cpp",
+   "name": "xcpp17-omp"
+  },
+  "language_info": {
+   "codemirror_mode": "text/x-c++src",
+   "file_extension": ".cpp",
+   "mimetype": "text/x-c++src",
+   "name": "C++",
+   "version": "17"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

notebooks/openmp-notebooks/linked_list.ipynb

@@ -0,0 +1,223 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "156447d2-9279-45a0-890b-4e519d2c796b",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#include <stdlib.h>\n",
+    "#include <stdio.h>\n",
+    "#include <omp.h>"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "c96fdeb0-817d-48c0-af8e-20a52947d60b",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#ifndef N\n",
+    "#define N 5\n",
+    "#endif\n",
+    "#ifndef FS\n",
+    "#define FS 38\n",
+    "#endif"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "22f97c49-78d1-496e-ac7c-978aed95331a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "struct node {\n",
+    "  int data;\n",
+    "  int fibdata;\n",
+    "  struct node *next;\n",
+    "};"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "b16b1e8a-8831-4b8d-9d57-09deeaaa88ee",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "struct node *init_list(struct node *p);\n",
+    "void processwork(struct node *p);\n",
+    "int fib(int n);"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "0ef8af6c-1d6f-4c68-84bc-3dd1d8092b06",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "int fib(int n) {\n",
+    "  int x, y;\n",
+    "  if (n < 2) {\n",
+    "    return (n);\n",
+    "  } else {\n",
+    "    x = fib(n - 1);\n",
+    "    y = fib(n - 2);\n",
+    "    return (x + y);\n",
+    "  }\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "id": "1fa0307d-fdc9-4503-95cb-1c6448791354",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "void processwork(struct node *p) {\n",
+    "  int n, temp;\n",
+    "  n = p->data;\n",
+    "  temp = fib(n);\n",
+    "\n",
+    "  p->fibdata = temp;\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "id": "03acb599-9329-49ff-8aff-c0902adb6c3c",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "struct node *init_list(struct node *p) {\n",
+    "  int i;\n",
+    "  struct node *head = NULL;\n",
+    "  struct node *temp = NULL;\n",
+    "\n",
+    "  head = (struct node*) malloc(sizeof(struct node));\n",
+    "  p = head;\n",
+    "  p->data = FS;\n",
+    "  p->fibdata = 0;\n",
+    "  for (i = 0; i < N; i++) {\n",
+    "    temp = (struct node*) malloc(sizeof(struct node));\n",
+    "    p->next = temp;\n",
+    "    p = temp;\n",
+    "    p->data = FS + i + 1;\n",
+    "    p->fibdata = i + 1;\n",
+    "  }\n",
+    "\n",
+    "  p->next = NULL;\n",
+    "  return head;\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 8,
+   "id": "f2dfb41b-e55f-43c0-b7f6-546a1697acb1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "int main() {\n",
+    "  double start, end;\n",
+    "  struct node *p = NULL;\n",
+    "  struct node *temp = NULL;\n",
+    "  struct node *head = NULL;\n",
+    "\n",
+    "  printf(\"Process linked list\\n\");\n",
+    "  printf(\"  Each linked list node will be processed by function 'processwork()'\\n\");\n",
+    "  printf(\"  Each ll node will compute %d fibonacci numbers beginning with %d\\n\", N, FS);\n",
+    "\n",
+    "  omp_set_num_threads(omp_get_max_threads());\n",
+    "\n",
+    "  p = init_list(p);\n",
+    "  head = p;\n",
+    "\n",
+    "  start = omp_get_wtime();\n",
+    "\n",
+    "#pragma omp parallel\n",
+    "  {\n",
+    "#pragma omp master\n",
+    "    printf(\"Threads:      %d\\n\", omp_get_num_threads());\n",
+    "\n",
+    "#pragma omp single\n",
+    "    {\n",
+    "      p = head;\n",
+    "      while (p) {\n",
+    "#pragma omp task firstprivate(p) // first private is required\n",
+    "        {\n",
+    "          processwork(p);\n",
+    "        }\n",
+    "        p = p->next;\n",
+    "      }\n",
+    "    }\n",
+    "  }\n",
+    "\n",
+    "  end = omp_get_wtime();\n",
+    "  p = head;\n",
+    "  while (p != NULL) {\n",
+    "    printf(\"%d : %d\\n\", p->data, p->fibdata);\n",
+    "    temp = p->next;\n",
+    "    free(p);\n",
+    "    p = temp;\n",
+    "  }\n",
+    "\n",
+    "  free(p);\n",
+    "  printf(\"Compute Time: %f seconds\\n\", end - start);\n",
+    "\n",
+    "  return 0;\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 9,
+   "id": "353e5dfd-fcae-43e6-97e3-ec98070811a1",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Process linked list\n",
+      "  Each linked list node will be processed by function 'processwork()'\n",
+      "  Each ll node will compute 5 fibonacci numbers beginning with 38\n",
+      "Threads:      16\n",
+      "38 : 39088169\n",
+      "39 : 63245986\n",
+      "40 : 102334155\n",
+      "41 : 165580141\n",
+      "42 : 267914296\n",
+      "43 : 433494437\n",
+      "Compute Time: 3.560749 seconds\n"
+     ]
+    }
+   ],
+   "source": [
+    "main();"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "C++17 + OpenMP",
+   "language": "cpp",
+   "name": "xcpp17-omp"
+  },
+  "language_info": {
+   "codemirror_mode": "text/x-c++src",
+   "file_extension": ".cpp",
+   "mimetype": "text/x-c++src",
+   "name": "C++",
+   "version": "17"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}