From d6a132bea9c6221dccea3e1e20a08490fb8c0a93 Mon Sep 17 00:00:00 2001
From: mcbarton <150042563+mcbarton@users.noreply.github.com>
Date: Thu, 16 May 2024 09:50:15 +0100
Subject: [PATCH] Adds -fopenmp flag to omp kernels + adds c++20 omp kernel

---
 CMakeLists.txt                                |   6 +++++
 .../jupyter/kernels/xcpp20-omp/kernel.json.in |  18 +++++++++++++
 .../jupyter/kernels/xcpp20-omp/logo-32x32.png | Bin 0 -> 1520 bytes
 .../jupyter/kernels/xcpp20-omp/logo-64x64.png | Bin 0 -> 3113 bytes
 share/jupyter/kernels/xcpp20-omp/logo-svg.svg |  25 ++++++++++++++++++
 5 files changed, 49 insertions(+)
 create mode 100644 share/jupyter/kernels/xcpp20-omp/kernel.json.in
 create mode 100644 share/jupyter/kernels/xcpp20-omp/logo-32x32.png
 create mode 100644 share/jupyter/kernels/xcpp20-omp/logo-64x64.png
 create mode 100644 share/jupyter/kernels/xcpp20-omp/logo-svg.svg

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f17015..30d17263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}")
@@ -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
 # ============
diff --git a/share/jupyter/kernels/xcpp20-omp/kernel.json.in b/share/jupyter/kernels/xcpp20-omp/kernel.json.in
new file mode 100644
index 00000000..1dec7fcc
--- /dev/null
+++ b/share/jupyter/kernels/xcpp20-omp/kernel.json.in
@@ -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
+  }
+}
diff --git a/share/jupyter/kernels/xcpp20-omp/logo-32x32.png b/share/jupyter/kernels/xcpp20-omp/logo-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..c09c458544bb83b9e3ff4d38f5758bda10ceebe8
GIT binary patch
literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003=0003=0Yp65&j0`b8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11#L-0K~z|Ut(R+1lw}mhf6u%763Z$#l~4*&L9|8_oH9c))2YeC
zsWF{ux|k+4))>`fj+1!di&IS(aK;ELYw|L~OnvC0l61ks3o346fp`H$NMM0omj!m;
z_kH@H6w9)^K>k0T=Y7uqf1dN4=RHR-3_SCt%^Kb<)&MU7;Zlg5y2-oY^X2I+L-i$w
zx?#n~wk$=V07O#1r4C?Ac(>)lg4HQKH(Wq=p)Fks<s*=@L%6I3UN6d?`rQo?kX?9e
zw4tc$g%mFXrolM9jssxi6lG68JuCs)g~wDW)Kwrh1Cc`@?hCIJa+_v0Htcvltz*yv
zuH{*L08AVvaeuUd+}sgev$c5XQazx6<)7M8O}cm=SP;xxq{Ym{n<I#^s+ddyhg+kr
zrHf`qsJkamg2*Y#p7yJsfR&&8u?#2z%z?H~9yfxl^f;2^t%w26uA!})5?c#L&UPS!
z$q?jiUpX!JUjfTLzYwl^uU;WQu2qxZ>C6OXrNjh{uNT#gE{aMoakX3XTk{(FnV(Oe
z@2s~w9%t9`^9n$i$CVI>+-wrO`tbNclf$)>dTY@HMq2(mOewM3E;b(gqU`v@`quU|
z&?f^Z0J=#DSPf5QBrs{Lb<pI!h>N<3m*yuT1l|^h>)_7v6XNK(hD<51m$Gp!i2?Hs
zFyZD1GE)5`@AeoRtZC!y-<<#?jkYj5HI~Q-Uw67;ILoSQ?bVI#nSnTh3V0+f&aX}z
z+PcZ#S4T&u_g`COos*JNt-LrdktqoyXmNVH?|fTz?!E6TCllfg2`C^uOkv8n5k5AL
zX0Ua?FL^KAJv!TdtaGQ2w_aYgqb#wjN1GgsIHZ82Q5MW5-}n!o?V!!&PYxJuo$f<>
zZ8eh$O1vq(#>ehTqQ`6S!^ukkJbCX#nw?#gRyBqe5M@>UY!{l{eztCpX4`+NHoVz+
zHKVWnvAdF3yXa0lngKwhMP*IaRN7oU2;jh}#^3@%K}wpARsDJXWX;)VB4aevn}+2l
zpa91Jd7cm#!S6Ng?hBV1Dt@V`yj#=sYf*RD4b1BAM2(t+qKpCfrlKCeCj~+XzZ58e
z1k|^7q3OO4>OINP#*q^h&I5;z&CxX7(q~CQ^Jc{Kv|Ha^kXjq2Dm}d-ddUHHm!I<?
z4=SMBYw*`)myb;~E6P`E7RKK)#=o*+M_MS(T@sP^^z4*Bw>+vmF=K3XAm4o<09I^2
zovavoZU4pOcuU)x3zK8}|9GytJ#61w$!}E`0hlpqEXyC7PJFCy*_NHU=v<QjlfAi9
zAMeL3S;(Fjz7KQ<yp1ibhramwNLq~PK~^qE_gNen5yoqaXY$(OnV|xVY^`sIz+^s1
z)Tld9l-T|sm;p?>A?5WbU2gZGAIi!T98TAL0IwA6BY9jbbEn@Hip&RR8tgp2sTe~_
zGnzLO`;~SgtmRlEX96Y^DdGAZ@Pv)Htm)c`((;O<yT2=$<#4(ZdmVW+orl-$;<J4x
z2TlIt@$+Ql?4ZTb_uY^&xLx<s+H{egE*qGtp>IbtZ_{%Kv7I2LIcHiD8=sv+=F~(6
z`hlLPZQ{M+!|eH`3K_H`VKb$<8+-)-%*{*1Bty1janV+0-F^$Vj)^2pHPK{uakS<#
z=Nj9CZ3C!8QF17GyR6qRa33%~Z$8L;U`i;DgM=L+@`z5|N^y{;)CV&PRbrc0A?5#S
z%MolthUIc#tz)1MLQh8bZyb%PtVc5R!9*vApL2&dnE2s=jp-=jBM>1*GtMBz8<eiU
zF{7Cu9^90LF7grF)^DW)A+}(S`jEY=Z~SoTE8<-%de<5RF9P8pccH2q*t>4X<M}_8
W!Ww75y$Xi_0000<MNUMnLSTZoM9_Tz

literal 0
HcmV?d00001

diff --git a/share/jupyter/kernels/xcpp20-omp/logo-64x64.png b/share/jupyter/kernels/xcpp20-omp/logo-64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..396c24463156c7b2c5cb48a9e1b8919c4a808607
GIT binary patch
literal 3113
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
D0zkP<

literal 0
HcmV?d00001

diff --git a/share/jupyter/kernels/xcpp20-omp/logo-svg.svg b/share/jupyter/kernels/xcpp20-omp/logo-svg.svg
new file mode 100644
index 00000000..5e117077
--- /dev/null
+++ 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>