Merge pull request #165084 from artanokhov/enable-ov-2024.0.0

openvino 2024.0.0
Homebrew · Mar 24, 2024 · 1313469 · 1313469
2 parents 666d8b4 + ad1d750
commit 1313469
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 48 deletions.
diff --git a/Formula/f/ffmpeg.rb b/Formula/f/ffmpeg.rb
@@ -6,7 +6,7 @@ class Ffmpeg < 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 5
+  revision 6
   head "https://github.com/FFmpeg/FFmpeg.git", branch: "master"
 
   livecheck do
@@ -15,13 +15,13 @@ class Ffmpeg < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:   "6613b4693ac636c995e3ba4a66e188ab15269edd44dbc0b268093c0636061ba1"
-    sha256 arm64_ventura:  "602649bab5fbc735d5dd3c8248da5adcb2e3f09596e2c08be5e6135cae12ccc8"
-    sha256 arm64_monterey: "9218e491b9fa65024d49181e4bba5d2ec7a7457a3564f1c9d6beccd1e16fc1f4"
-    sha256 sonoma:         "a104f9dd4ae60ad8ae421dcdecffb1e1afb1c3492cff12856d5c915ab767684e"
-    sha256 ventura:        "f1443560392397ff50949dd3eeb3044d3512c2fed68640481dd4b10dc7accdad"
-    sha256 monterey:       "53361041f6da4933eb47c415df4a45398d01e99962fc99ac362cc057cd366457"
-    sha256 x86_64_linux:   "3fe434ba52a51847c06567a883f7d1b5236dcad9714d651421e228abf9034f6b"
+    sha256 arm64_sonoma:   "8c319a7edac5f72d23b9115b5d4d2c6e2d313f16f75330ceb9d84014b091f805"
+    sha256 arm64_ventura:  "292d0b2d88e19a76eb322ad5dcb029eae675bbf8e7b431a53f511dc2ab774b05"
+    sha256 arm64_monterey: "bf491699c21ffdca67fc19af2d9c2378dac862fb60faa777cff854537a1a1284"
+    sha256 sonoma:         "2f211c6107266bfd1a784e385d8b021a08b9611d86b57f0983f91e81fc87f36a"
+    sha256 ventura:        "543fcd2a9fe8e2ed193d91b81dee111ef442accce922f9355a392af1cdd51f0e"
+    sha256 monterey:       "f8a1a7f6869eece289c112b8c64cb755ae285bea8fbfed926addc9fa787066ab"
+    sha256 x86_64_linux:   "479262bd13fa7ce0de04269251c5b0c01387f251f535e5827efbfae5a3dba205"
   end
 
   depends_on "pkg-config" => :build

diff --git a/Formula/o/opencv.rb b/Formula/o/opencv.rb
@@ -12,13 +12,14 @@ class Opencv < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:   "6210f9ac6415a93fcfecef196aabd96f6760fb652453d9a6de3513ed6f98891f"
-    sha256 arm64_ventura:  "4fe6af57629c350c3cb08830da530c90f01c72f9acf86f2afec5202673dc3677"
-    sha256 arm64_monterey: "dc13e6e9f5b87967ea9b5adf25662b182b46c4a138210d35de3d9f9c7841db74"
-    sha256 sonoma:         "67eee860e4908159390b1eef9eee011b842e7e21a00690c6ec53b691cd12ce35"
-    sha256 ventura:        "5ff7fcb56bcad38b373246ea28503db07d8bc6277a778a0d903ff9abe0d0e1e4"
-    sha256 monterey:       "a074724fd95520d580a7201a40352befed07f47f785c383f341ed67156d0879e"
-    sha256 x86_64_linux:   "34ebb84b52ac74514332006d703101fab7903ba48047b98b7a1e4962a6db0c64"
+    rebuild 1
+    sha256 arm64_sonoma:   "14e72df1f939ea3ec4d4aaad3e0cd359847ed13947f06799428545882daa3f21"
+    sha256 arm64_ventura:  "a0d69b15e8525f22d73a96fbcef5a7da2872f024640016d3aa9b37268d90b103"
+    sha256 arm64_monterey: "cf0133cbca2a151e69ddce93747cf30db7910ecaf184520aa20dd40be8bb5918"
+    sha256 sonoma:         "68a927fa7bdd8f4b162a92a8ba114e30e8ff7a0bdde6a31e6c44f0ef13999a37"
+    sha256 ventura:        "4ecfdefa4296b237148b8a54aac4d293890fa4167ed2b415964ca31de1a1bd88"
+    sha256 monterey:       "7e51b60650e6bfa14add77a44b0adf50fc015ceb5a15726fb3f6a686ccef7496"
+    sha256 x86_64_linux:   "cf57517e14a1da55feced547377c1c19fbf0c03e77a9f8394345e3c1c71893e1"
   end
 
   depends_on "cmake" => :build
@@ -62,6 +63,18 @@ def python3
     "python3.12"
   end
 
+  # Patch for DNN module to work with OpenVINO API 2.0(enabled starting OV 2022.1 release)
+  patch do
+    url "https://raw.githubusercontent.com/Homebrew/formula-patches/a10057a843de773896a50e9b18f4559a8bbc4d27/opencv/openvino-api2.0.patch"
+    sha256 "08f918fa762715d0fbc558baee9867be8f059ee3008831dc0a09af63404a9048"
+  end
+
+  # Patch for G-API to work with OpenVINO API 2.0(enabled starting OV 2022.1 release)
+  patch do
+    url "https://raw.githubusercontent.com/Homebrew/formula-patches/a10057a843de773896a50e9b18f4559a8bbc4d27/opencv/gapi-openvino-api2.0.patch"
+    sha256 "b67aa8882559858824c5841ba3d0746078273be081540b0d339c0ff58dc9452d"
+  end
+
   def install
     resource("contrib").stage buildpath/"opencv_contrib"
 

diff --git a/Formula/o/openvino.rb b/Formula/o/openvino.rb
@@ -1,8 +1,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/2023.3.0.tar.gz"
-  sha256 "27cff20ac0662f5495d2c2eec47cbe5469ab2f225aa091d223f8bfc9d32f4fc3"
+  url "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.0.0.tar.gz"
+  sha256 "b3c257f8af9545ae68a6ea217173b2b2de9dd42d35e8703a7a51d76f4c2bfe2f"
   license "Apache-2.0"
   head "https://github.com/openvinotoolkit/openvino.git", branch: "master"
 
@@ -12,13 +12,13 @@ class Openvino < Formula
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "0aa85634e6098d2700f123a7938482dbc04ed8fdb9e7ed5c8126bca81c5ae7b6"
-    sha256 cellar: :any,                 arm64_ventura:  "1b4878e5aa0687c126e221c4b623757ffd9f5d285a657aefbc8f43090a20c12c"
-    sha256 cellar: :any,                 arm64_monterey: "c348ebe9b9513ca07f63386bb285e41b4764935d99e51d0424665281ecca05fd"
-    sha256 cellar: :any,                 sonoma:         "507fe65857c6227ef974646e002b36241f59acfc3de8969d184842971e56f375"
-    sha256 cellar: :any,                 ventura:        "e1db750a4f82eb41c7639b23a84b49bc540e8a298049c335a35e507c01c1efb2"
-    sha256 cellar: :any,                 monterey:       "6eac7a57c4fb2f7babc6e51dbd03d737a01038f56c5dfe81a559eb02c05cf20a"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "44900ffc477d5c4bca4575a96f05448c69e298a4c2a4e059295aaa25172b8389"
+    sha256 cellar: :any,                 arm64_sonoma:   "fb86de9e84da998b69a659311fb35c272968911aea5e841aa1edb69fd8bf0f64"
+    sha256 cellar: :any,                 arm64_ventura:  "46eb2eb8b7bf2344a173cb3750ea6d342b458b4b5ae005eb2500b091beb8c7da"
+    sha256 cellar: :any,                 arm64_monterey: "0cb9fbb8cc3ed505e70316cde4b482a39f1de8c78a800f1a68f6536c471ba0f4"
+    sha256 cellar: :any,                 sonoma:         "7a5482987b73437ecfc8b49f0fba8f21e7ebcfc9075bf44bab29e0274a1a1959"
+    sha256 cellar: :any,                 ventura:        "95f814da35c37be0b1a821dfd6ce0a0a4112313b19e9c7c1dca95603fa17bb9d"
+    sha256 cellar: :any,                 monterey:       "af4d1185f371d20da874289ba8e383a03581e3dc9a75fc067df3df3ea68342f2"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "f7bfe946861ebfe34c358b9f693ceee47307f5c556f5d62db573dde79c008ef5"
   end
 
   depends_on "cmake" => [:build, :test]
@@ -31,6 +31,7 @@ class Openvino < Formula
   depends_on "python@3.12" => [:build, :test]
   depends_on "numpy"
   depends_on "pugixml"
+  depends_on "python-packaging"
   depends_on "snappy"
   depends_on "tbb"
 
@@ -41,8 +42,8 @@ class Openvino < Formula
     depends_on "opencl-icd-loader"
 
     resource "onednn_gpu" do
-      url "https://github.com/oneapi-src/oneDNN/archive/cb77937ffcf5e83b5d1cf2940c94e8b508d8f7b4.tar.gz"
-      sha256 "2ca304c033786aa5c3ec1ec6f8fc3936ae5c6874d5964b586311da11bec2ec4a"
+      url "https://github.com/oneapi-src/oneDNN/archive/494af5f9921bdae98f1a0e2955fa7d76ff386c4f.tar.gz"
+      sha256 "e2f36563cecf39197ad8d4f8b351ccc5a431085dad26e47c0ae6f0bb79149df7"
     end
   end
 
@@ -59,19 +60,14 @@ class Openvino < Formula
     depends_on "xbyak" => :build
   end
 
-  resource "ade" do
-    url "https://github.com/opencv/ade/archive/refs/tags/v0.1.2d.tar.gz"
-    sha256 "edefba61a33d6cd4b78a9976cb3309c95212610a81ba6dade09882d1794198ff"
-  end
-
   resource "mlas" do
-    url "https://github.com/openvinotoolkit/mlas/archive/7a35e48a723944972088627be1a8b60841e8f6a5.tar.gz"
-    sha256 "b7fdd19523a88373d19fd8d5380f64c2834040fa50a6f0774acf08f3fa858daa"
+    url "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz"
+    sha256 "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c"
   end
 
   resource "onednn_cpu" do
-    url "https://github.com/openvinotoolkit/oneDNN/archive/cb3060bbf4694e46a1359a3d4dfe70500818f72d.tar.gz"
-    sha256 "9dea3da8dab8511677db3db68ff4d9cdbfd31d8614bf04fd79a7610892bb991c"
+    url "https://github.com/openvinotoolkit/oneDNN/archive/f82148befdbdc9576ec721c9d500155ee4de8060.tar.gz"
+    sha256 "7fce5c6b499ffe1a30c26b2d4e4a5193a38aa217b6f54e44eea52b21cf38a684"
   end
 
   resource "onnx" do
@@ -83,16 +79,9 @@ def python3
     "python3.12"
   end
 
-  # Fix linux build with our OpenCL
-  # https://github.com/openvinotoolkit/openvino/pull/22051
-  patch do
-    url "https://github.com/openvinotoolkit/openvino/commit/0d455544f599ca5b2bb8993f209a01e7b61a336e.patch?full_index=1"
-    sha256 "67a1ba9296d3f23eeb5a3cf95dfe24171657d21e6cc6eef372a7e308f57a3092"
-  end
-
   def install
     # Remove git cloned 3rd party to make sure formula dependencies are used
-    dependencies = %w[thirdparty/ade thirdparty/ocl
+    dependencies = %w[thirdparty/ocl
                       thirdparty/xbyak thirdparty/gflags
                       thirdparty/ittapi thirdparty/snappy
                       thirdparty/pugixml thirdparty/protobuf
@@ -104,7 +93,6 @@ def install
                       src/plugins/intel_cpu/thirdparty/ComputeLibrary]
     dependencies.each { |d| (buildpath/d).rmtree }
 
-    resource("ade").stage buildpath/"thirdparty/ade"
     resource("onnx").stage buildpath/"thirdparty/onnx/onnx"
     resource("mlas").stage buildpath/"src/plugins/intel_cpu/thirdparty/mlas"
     resource("onednn_cpu").stage buildpath/"src/plugins/intel_cpu/thirdparty/onednn"
@@ -166,10 +154,10 @@ def install
       #ifndef __APPLE__
           OV_CALL(ov_core_get_property(core, "GPU", "AVAILABLE_DEVICES", &ret));
       #endif
-          OV_CALL(ov_core_get_property(core, "AUTO", "SUPPORTED_METRICS", &ret));
-          OV_CALL(ov_core_get_property(core, "MULTI", "SUPPORTED_METRICS", &ret));
-          OV_CALL(ov_core_get_property(core, "HETERO", "SUPPORTED_METRICS", &ret));
-          OV_CALL(ov_core_get_property(core, "BATCH", "SUPPORTED_METRICS", &ret));
+          OV_CALL(ov_core_get_property(core, "AUTO", "SUPPORTED_PROPERTIES", &ret));
+          OV_CALL(ov_core_get_property(core, "MULTI", "SUPPORTED_PROPERTIES", &ret));
+          OV_CALL(ov_core_get_property(core, "HETERO", "SUPPORTED_PROPERTIES", &ret));
+          OV_CALL(ov_core_get_property(core, "BATCH", "SUPPORTED_PROPERTIES", &ret));
           ov_core_free(core);
           return 0;
       }