Merge pull request #191090 from artanokhov/openvino-2024.4.0

openvino 2024.4.0
Homebrew · Sep 23, 2024 · 91b5691 · 91b5691
2 parents 47b5ebe + 16dbb32
commit 91b5691
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 38 deletions.
diff --git a/Formula/f/[email protected] b/Formula/f/[email protected]
@@ -6,20 +6,20 @@ class FfmpegAT6 < Formula
   # None of these parts are used by default, you have to explicitly pass `--enable-gpl`
   # to configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
   license "GPL-2.0-or-later"
-  revision 2
+  revision 3
 
   livecheck do
     url "https://ffmpeg.org/download.html"
     regex(/href=.*?ffmpeg[._-]v?(6(?:\.\d+)+)\.t/i)
   end
 
   bottle do
-    sha256 arm64_sequoia: "ed8f0f667339c888a0f91a147767f9447c0f46c55702fc9c02dec78deab2c1af"
-    sha256 arm64_sonoma:  "3a48ddaa3461f41b39789d333f8a9e687d620eac420b81fe67b2b3ec609624cf"
-    sha256 arm64_ventura: "757329a5c2e17e70ff7b86dac3edd9a0a243b8cd1bbd0e3d05742cd5015b5b0e"
-    sha256 sonoma:        "9e0cc76bb9b4663d09e40b9557564cdc4d95a6f00fc5eaa97f1379f195582d79"
-    sha256 ventura:       "4f1f865a660ace46fe30312c497cb4498bd7a2cb217c80f595a3047d368bdd39"
-    sha256 x86_64_linux:  "f2bc668a78415b7e4c625d6ec7a2094a05f1be7799b68cf2ee5499b3c35b7977"
+    sha256 arm64_sequoia: "5d54158b8f70b18c48e92abb63f797820bc5c981f62cfa9b7bc5fd2c1148bfe2"
+    sha256 arm64_sonoma:  "d2912673745744ea72f55451ef21e02a0cd68969834d7c6e6891867bf4589452"
+    sha256 arm64_ventura: "0d795c9b56ee515ba67998cbec4242b831e716b6d4c39be202f6d3767335f1a8"
+    sha256 sonoma:        "16d21d6a68bda3ade7c8de491290ea3447ab7134dc2f16b6d5e84e3477a3604b"
+    sha256 ventura:       "d6c1f00cd256e57e28bab5885c385119ba338e49a6649cf5d2bd77702cb261c6"
+    sha256 x86_64_linux:  "670438f630a20352e5aa5b825fbc7c082a80bd9b583b1c3d64f2a5abe855cc68"
   end
 
   keg_only :versioned_formula

diff --git a/Formula/o/opencv.rb b/Formula/o/opencv.rb
@@ -4,7 +4,7 @@ class Opencv < Formula
   url "https://github.com/opencv/opencv/archive/refs/tags/4.10.0.tar.gz"
   sha256 "b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9"
   license "Apache-2.0"
-  revision 6
+  revision 7
   head "https://github.com/opencv/opencv.git", branch: "4.x"
 
   livecheck do
@@ -13,11 +13,11 @@ class Opencv < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:  "8f5af4bd99e403029e136d648bb6b7d6ad0bbd046435c5758ab9c8eb51b98f19"
-    sha256 arm64_ventura: "8ef34089adfdc0c70f37312c05ce930a82a4b43c5dd39bb3715229389fd84008"
-    sha256 sonoma:        "dc58d08c3409fe20e3fa7c41531f012f298dfb9cf320602745bbad706eb61aca"
-    sha256 ventura:       "e0d58c4c7660a962a7546a8490bae4707f59281d043839a7f344288575baafc2"
-    sha256 x86_64_linux:  "552d5d89d5cdd5dabb7ed39680fa8baaf3947cce191e3cfe544e813a05c52a9a"
+    sha256 arm64_sonoma:  "9a93de7407a79dd2950ea917daa60afa96743c8fc5153f13a4d2e19d3edae23c"
+    sha256 arm64_ventura: "5ee627880393af0683250897d408ade7197e76fe4aec067c24cc23f7605a3f0f"
+    sha256 sonoma:        "d42ee20679b97d38ca73361b83807828562e0a8d12d020b1b2d47a1f0d8279cb"
+    sha256 ventura:       "f5d6cc613807726413b66589899bc279dc3f00901577d9a3e23fe45ffa0a31b0"
+    sha256 x86_64_linux:  "fcaeca276347313603c8f6ac1ad49bb318e73e808398fa343b45cb1e21dbdccd"
   end
 
   depends_on "cmake" => :build

diff --git a/Formula/o/openvino.rb b/Formula/o/openvino.rb
@@ -3,8 +3,8 @@ class Openvino < Formula
 
   desc "Open Visual Inference And Optimization toolkit for AI inference"
   homepage "https://docs.openvino.ai"
-  url "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.3.0.tar.gz"
-  sha256 "53fccad05279d0975eca84ec75517a7c360be9b0f7bcd822da29a7949c12ce70"
+  url "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.4.0.tar.gz"
+  sha256 "aeb6297e3e88b4ab7803b27b231a72bd0493b6761ef98f225142146be500f538"
   license "Apache-2.0"
   head "https://github.com/openvinotoolkit/openvino.git", branch: "master"
 
@@ -14,14 +14,12 @@ class Openvino < Formula
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia:  "fee261c029e1cc641b21c0d781fcd154c53ed2617e9501b815210bfb41c89826"
-    sha256 cellar: :any,                 arm64_sonoma:   "158be96f65c4ce698c4a1becdb7803463bc0380220f608f4963d176a3550149f"
-    sha256 cellar: :any,                 arm64_ventura:  "7ca9bc94eb43b524ce2c25e52132f62efadbc698a5089b4e6e4c39393dafc3e2"
-    sha256 cellar: :any,                 arm64_monterey: "07f28bc29b87551d569eab64ac9e841f78a319c003579d8167ebb0d751129485"
-    sha256 cellar: :any,                 sonoma:         "ccf802283116214ad047a729c087582c045d46acfb8e5475dcdba653045991f0"
-    sha256 cellar: :any,                 ventura:        "a6f32cdf5b71048312e1c5e52169a49fd84e2980a02635f7c1a9adde9e520502"
-    sha256 cellar: :any,                 monterey:       "28d0d0d2d271576f4f5b918120762c81480de5033c309697834982e18be43200"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "0c39bea6a7458b85e9029404d968050b65dcad013de199571e15e83cb629f6bf"
+    sha256 cellar: :any,                 arm64_sequoia: "26f74a2567d422adfb7b3d958ab4fb615e3fd8d41005befe83e661e5d8163445"
+    sha256 cellar: :any,                 arm64_sonoma:  "5aa320c7c1f517ce0f38e809bfd651a76f81783a1d0831ca75610cc5f7fef81c"
+    sha256 cellar: :any,                 arm64_ventura: "10f9ed2e14ab08b76868376cf9e87eb0749885a2eae220beaf2d8821afb7f0ae"
+    sha256 cellar: :any,                 sonoma:        "bdb3038b23dce15a34fd814cf610df9f2fc2f048c9995e85f5cdcbf093d56cd1"
+    sha256 cellar: :any,                 ventura:       "a429bc3ce8cba30b12be0f27aa7eeaa49df69b5871ec56c64c3e6ee63a7843f3"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "7318aa437514f738fbba3b3b1c175c80e689df8ff4f3be967e6d2aab82fc7cab"
   end
 
   depends_on "cmake" => [:build, :test]
@@ -43,17 +41,17 @@ class Openvino < Formula
     depends_on "opencl-icd-loader"
 
     resource "onednn_gpu" do
-      url "https://github.com/oneapi-src/oneDNN/archive/7ab8ee9adda866d675edeee7a3a6a29b2d0a1572.tar.gz"
-      sha256 "66363988363744e49fff55f4fcdb72318ff3f35fba6da68302c1662c837c22ac"
+      url "https://github.com/oneapi-src/oneDNN/archive/refs/tags/v3.6-pc.tar.gz"
+      sha256 "d0eeff1425e318887c429a709d58010a580c8173eba8fbee74bca41b7f621f59"
     end
   end
 
   on_arm do
     depends_on "scons" => :build
 
     resource "arm_compute" do
-      url "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.06.tar.gz"
-      sha256 "68e24589905638e406a98ad48236097ab30112f2849b35e196b7b1efb0ce74e6"
+      url "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.08.tar.gz"
+      sha256 "b3576ffa2a70e7704bdf7febe7109f4cfb416a0178222b58f5ee0fd455980337"
     end
   end
 
@@ -67,13 +65,13 @@ class Openvino < Formula
   end
 
   resource "onednn_cpu" do
-    url "https://github.com/openvinotoolkit/oneDNN/archive/f0f8defe2dff5058391f2a66e775e20b5de33b08.tar.gz"
-    sha256 "13bee5b8522177f297e095e3eba5948c1a7ee7a816d19d5a59ce0f717f82cedc"
+    url "https://github.com/openvinotoolkit/oneDNN/archive/c8ae8d96e963bd04214858319fa334968e5e73c9.tar.gz"
+    sha256 "b9c2a53061b4528231ff5fbcee85900d698c329c7977b1f39c5d3d65f29c2caa"
   end
 
   resource "onnx" do
-    url "https://github.com/onnx/onnx/archive/refs/tags/v1.15.0.tar.gz"
-    sha256 "c757132e018dd0dd171499ef74fca88b74c5430a20781ec53da19eb7f937ef68"
+    url "https://github.com/onnx/onnx/archive/refs/tags/v1.16.0.tar.gz"
+    sha256 "0ce153e26ce2c00afca01c331a447d86fbf21b166b640551fe04258b4acfc6a4"
   end
 
   resource "openvino-telemetry" do
@@ -90,13 +88,6 @@ def python3
     "python3.12"
   end
 
-  # Fix Python build (https://github.com/openvinotoolkit/openvino/pull/25695)
-  # Remove patch when available in release.
-  patch do
-    url "https://github.com/openvinotoolkit/openvino/commit/e653ebc7c8c11508c7e5fd4f797174d21e4382bc.patch?full_index=1"
-    sha256 "d4b6eb705decaf9d8f7319a8cce69b64f9c719536138b510aa4b499b983b016c"
-  end
-
   def install
     # Remove git cloned 3rd party to make sure formula dependencies are used
     dependencies = %w[thirdparty/ocl