libraries/openvino: Update to 2024.2.0

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 33 insertions, 39 deletions

diff --git a/libraries/openvino/openvino.SlackBuild b/libraries/openvino/openvino.SlackBuild
index 871a085db5..81ad037d73 100644
--- a/libraries/openvino/openvino.SlackBuild
+++ b/libraries/openvino/openvino.SlackBuild
@@ -25,13 +25,13 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openvino
-VERSION=${VERSION:-2024.1.0}
+VERSION=${VERSION:-2024.2.0}
 VERSION_FLATBUFFERS=24.3.25
 VERSION_ONNX=1.16.0
 VERSION_ITTAPI=3.24.4
 VERSION_PROTOBUF=21.12
-COMMIT_ONEDNN=26633ae49edd4353a29b7170d9fcef6b2d79f4b3
-COMMIT_ONEDNN_GPU=4e6ff043c439652fcf6c400ac4e0c81bbac7c71c
+COMMIT_ONEDNN=a320d02d6e733c775724901675cbc8944391459d
+COMMIT_ONEDNN_GPU=37f48519b87cf8b5e5ef2209340a1948c3e87d72
 COMMIT_MLAS=d1bc25ec4660cddd87804fcf03b2411b5dfb2e94
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -126,51 +126,45 @@ tar vxf $CWD/mlas-$COMMIT_MLAS.tar.gz
 ln -s mlas-$COMMIT_MLAS mlas
 )
 # oneDNN for cpu inference device
-# oneDNN supports 64 bit platforms only
-if [ "$LIBDIRSUFFIX" == 64 ]; then
-  CPU=ON
-  GPU=ON
-  (
-  cd src/plugins/intel_cpu/thirdparty
-  rmdir onednn
-  tar vxf $CWD/oneDNN-$COMMIT_ONEDNN.tar.gz
-  ln -s oneDNN-$COMMIT_ONEDNN onednn
-  )
-  # oneDNN for gpu inference device, original project
-  (
-  cd src/plugins/intel_gpu/thirdparty
-  rmdir onednn_gpu
-  tar vxf $CWD/oneDNN-$COMMIT_ONEDNN_GPU.tar.gz
-  ln -s oneDNN-$COMMIT_ONEDNN_GPU onednn_gpu
-  )
-else
-  CPU=OFF
-  GPU=OFF
-fi
+(
+cd src/plugins/intel_cpu/thirdparty
+rmdir onednn
+tar vxf $CWD/oneDNN-$COMMIT_ONEDNN.tar.gz
+ln -s oneDNN-$COMMIT_ONEDNN onednn
+)
+# oneDNN for gpu inference device, original project
+(
+cd src/plugins/intel_gpu/thirdparty
+rmdir onednn_gpu
+tar vxf $CWD/oneDNN-$COMMIT_ONEDNN_GPU.tar.gz
+ln -s oneDNN-$COMMIT_ONEDNN_GPU onednn_gpu
+)
 
 mkdir -p build
 cd build
   unshare -n cmake \
+    -G Ninja \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_STANDARD=17 \
     -DCMAKE_INSTALL_PREFIX=/usr/share/openvino \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DONNX_ML=ON \
+    -DENABLE_CPPLINT=OFF \
+    -DENABLE_LTO=ON \
     -DENABLE_SYSTEM_FLATBUFFERS=OFF \
+    -DENABLE_SYSTEM_PUGIXML=ON \
     -DENABLE_SYSTEM_SNAPPY=ON \
     -DENABLE_SYSTEM_TBB=ON \
-    -DENABLE_SYSTEM_PUGIXML=ON \
     -DENABLE_PROFILING_ITT=ON \
     -DENABLE_TBBBIND_2_5=OFF \
     -DENABLE_JS=OFF \
     -DENABLE_SAMPLES=OFF \
-    -DENABLE_INTEL_CPU=$CPU \
-    -DENABLE_INTEL_GPU=$GPU \
+    -DENABLE_INTEL_CPU=ON \
+    -DENABLE_INTEL_GPU=ON \
     -DENABLE_INTEL_NPU=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install/strip DESTDIR=$PKG
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install/strip
 cd ..
 
 # We don't build samples, so we remove samples stub files
diff --git a/libraries/openvino/openvino.info b/libraries/openvino/openvino.info
index 4309f5c41c..0c4e908cb3 100644
--- a/libraries/openvino/openvino.info
+++ b/libraries/openvino/openvino.info
@@ -1,24 +1,24 @@
 PRGNAM="openvino"
-VERSION="2024.1.0"
+VERSION="2024.2.0"
 HOMEPAGE="https://github.com/openvinotoolkit/openvino/"
-DOWNLOAD="https://github.com/openvinotoolkit/openvino/archive/2024.1.0/openvino-2024.1.0.tar.gz \
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/openvinotoolkit/openvino/archive/2024.2.0/openvino-2024.2.0.tar.gz \
           https://github.com/openvinotoolkit/mlas/archive/d1bc25e/mlas-d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz \
-          https://github.com/openvinotoolkit/onednn/archive/26633ae/oneDNN-26633ae49edd4353a29b7170d9fcef6b2d79f4b3.tar.gz \
+          https://github.com/openvinotoolkit/onednn/archive/a320d02/oneDNN-a320d02d6e733c775724901675cbc8944391459d.tar.gz \
           https://github.com/google/flatbuffers/archive/v24.3.25/flatbuffers-24.3.25.tar.gz \
           https://github.com/onnx/onnx/archive/v1.16.0/onnx-1.16.0.tar.gz \
           https://github.com/intel/ittapi/archive/v3.24.4/ittapi-3.24.4.tar.gz \
-          https://github.com/oneapi-src/oneDNN/archive/4e6ff04/oneDNN-4e6ff043c439652fcf6c400ac4e0c81bbac7c71c.tar.gz \
+          https://github.com/oneapi-src/oneDNN/archive/37f4851/oneDNN-37f48519b87cf8b5e5ef2209340a1948c3e87d72.tar.gz \
           https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protobuf-all-21.12.tar.gz"
-MD5SUM="459481c0b3f7fe3fcc2be799fe413308 \
+MD5SUM_x86_64="7659d30e9939dc79e63b4be5db0001a9 \
         0e87473410db355fd9251a2e1337dc32 \
-        2cbdb4f80608959b3c013bab745bb807 \
+        5ecf1b1c754844e26c7c790bc5dd03fb \
         f28f12fc16c72f4e7c22066a35405c3a \
         5ef5a7bd4f9dad914bddc3b4335a67cd \
         aec402d3441bb8ecb9c8e75bab6cc102 \
-        973bf9dec73db0d0ed47997b8ba163e2 \
+        e0e76586d5c2480ad917919c391aa3aa \
         7fb5fa6217646e5146346e39d9aad6f9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
 REQUIRES="oneTBB xbyak pugixml snappy pybind11 OpenCL-CLHPP"
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds@schoepfer.info"