Squashed commit of the following:

commit 7fceba8 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Fri Sep 22 14:25:06 2023 +0400 Fixed auto-batch plugin since it starts to depend on tbb commit 13964b2 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Fri Sep 22 02:20:34 2023 +0400 try to build debug packages commit 62339c1 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Thu Sep 21 23:46:13 2023 +0400 Use rapidjson from conda-forge commit a7e3432 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Thu Sep 21 23:36:27 2023 +0400 Latest 2023.2.0 state + find_package(Python3) commit a5db0c8 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Thu Sep 21 02:13:06 2023 +0000 Set state to be 2023.1.0 plus patch for FindPython3.cmake: second attemp commit b18dc6c Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Wed Sep 20 22:58:36 2023 +0000 Set state to be 2023.1.0 plus patch for FindPython3.cmake commit 9d33f89 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Wed Sep 20 22:31:07 2023 +0000 Final fixes commit c3e98cd Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Wed Sep 20 16:13:37 2023 +0000 use cython with build-python commit 079bd2c Merge: f868f22 b33d7ff Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Wed Sep 20 13:23:22 2023 +0000 merge commit f868f22 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Wed Sep 20 13:20:23 2023 +0000 Use FindPython3.cmake commit b33d7ff Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Tue Sep 19 00:44:51 2023 +0400 don't use host packages for pypy commit 1799852 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Mon Sep 18 18:52:53 2023 +0400 added numpy dependency commit 142c2f6 Author: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon Sep 18 12:14:12 2023 +0000 MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.17.11.00.01 commit 421f282 Author: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon Sep 18 12:06:46 2023 +0000 Rebuild for PyPy3.9 commit efdb9a6 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Mon Sep 18 10:53:13 2023 +0400 2023.1.0 (conda-forge#42) * Enable 2023.1.0.dev20230623 pre-release (conda-forge#13) * Enable 2023.1.0.dev20230623 pre-release * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.11.15.50.57 * Changed label to openvino_dev * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.11.15.50.57 * Added patch for protobuf * Fixed 001-win64-find-ocl.patch * Splitted version and dev-version for testing purposes * Added version_postfix for test purposes * Updated paths for tests --------- Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> * Python API support * Added ADE patches * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.13.11.37.28 * Added singledispatchmethod for python 3.7 and older * Added missing dependencies * Current master * Python API support in pre-release (conda-forge#17) * Updated state * [DEV] Fix C1060 on Windows (conda-forge#22) * bld.bat: Disabled parallel build. Switched to MSVC generator instead Ninja * Updated 001-win64-find-ocl with latest code from master * Unpin libprotobuf-static for Windows * Fixed copy on Windows * Fixed path for license * Current master: 19 July 2023 * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.19.16.49.37 * Fixed python search paths * temporary disabled Windows tests * Updated to 21 July 2023 * Added patch for aarch64 * Trying to add pypy * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.22.11.37.27 * conda smithy rerender for pypy * Removed pypy python * Added libopenvino-dev package for C / C++ development * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.23.14.34.17 * Improvements * try simpligy * Fixes for 2023.1.0.dev20230623 (conda-forge#29) * Updated timeout for Azure. Added 006-win64-python-search patch. Updated 003-lin-arm64-compute-lib.patch * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.07.23.14.34.17 * Update meta.yaml Disabled samples build on Windows --------- Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com> * Merge conflicts * Disable deprecation warnings * Bump versions for 2023.1.0.dev20230728 * Added MLAS for CPU plugin * Added condition 'win64 or linux64' for MLAS * Updated condition for MLAS * Updated condition for MLAS * Updated condition for MLAS. * Bump version to created pre-release tag * generate per-python version main 'openvino' package (conda-forge#32) * Fixed test for Windows * 2023.1.0.dev20230811 pre-release (conda-forge#35) * Switched to 2023.1.0.dev20230811 pre-release * Switched to tag, aligned with current dev state * Re-upload patch * Unlock mlas for aarch64 and arm64 * Added 001-python-osx-arm64.patch (conda-forge#41) * MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.09.10.15.40 * Updated patch for ARM Compute cross compilation with conda-forge * Updated with 2023.1.0 tag * updated oneDNN CPU submodule --------- Co-authored-by: Artyom Anokhov <artyom.anokhov@intel.com> Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit baa9d4b Merge: 2e31623 8b6ad36 Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Sat Sep 9 23:26:11 2023 +0400 Merge remote-tracking branch 'upstream/dev' commit 2e31623 Author: Artyom Anokhov <artyom.anokhov@intel.com> Date: Tue Sep 5 17:19:38 2023 +0200 Enable 2023.0.2 (conda-forge#38) * Switch to 2023.0.2 * Added 002-find-protobuf.patch * Updated 002-find-protobuf.patch * Updated 002-find-protobuf.patch * Switch OV source to official tag 23.0.2 commit 3115372 Author: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon Aug 28 23:33:50 2023 -0500 Rebuild for pugixml113 (conda-forge#37) * Rebuild for pugixml113 * MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.28.12.35.38 commit 51d623f Merge: 5696ddb d4561fe Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat Jul 22 18:43:48 2023 +0000 ARM OSX Migrator (conda-forge#27) automerged PR by conda-forge/automerge-action commit d4561fe Author: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat Jul 22 13:37:35 2023 +0000 MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.22.11.37.27 commit 4467154 Author: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat Jul 22 13:36:35 2023 +0000 migration: OSXArm commit 5696ddb Author: Ilya Lavrenov <ilya.lavrenov@intel.com> Date: Fri Jul 21 03:36:28 2023 +0400 Fixes for 2023.0.1 release (conda-forge#24)
ilya-lavrenov · Nov 4, 2023 · 2e72cda · 2e72cda
1 parent 1ad171f
commit 2e72cda
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 64 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -26,6 +26,7 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.8.* *_cpython
+- 3.9.* *_73_pypy
 - 3.9.* *_cpython
 snappy:
 - '1'

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -30,6 +30,7 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.8.* *_cpython
+- 3.9.* *_73_pypy
 - 3.9.* *_cpython
 snappy:
 - '1'

diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml
@@ -0,0 +1,40 @@
+migrator_ts: 1647123563
+__migrator:
+    migration_number: 1
+    operation: key_add
+    primary_key: python
+    ordering:
+        python:
+            - 3.6.* *_cpython
+            - 3.7.* *_cpython
+            - 3.8.* *_cpython
+            - 3.9.* *_cpython
+            - 3.10.* *_cpython
+            - 3.6.* *_73_pypy
+            - 3.7.* *_73_pypy
+            - 3.8.* *_73_pypy
+            - 3.9.* *_73_pypy
+    paused: False
+    longterm: True
+    use_local: False
+    check_solvable: True
+    exclude_pinned_pkgs: False
+    pr_limit: 10
+    bump_number: 1
+    commit_message: "Rebuild for PyPy3.9"
+    exclude:
+      # this shouldn't attempt to modify the python feedstocks
+      - python
+      - pypy3.6
+      - pypy-meta
+    ignored_deps_per_node:
+      matplotlib:
+        - pyqt
+
+python:
+  - 3.9.* *_73_pypy    # [not (osx and arm64)]
+numpy:
+  # part of a zip_keys: python, python_impl, numpy
+  - 1.22               # [not (osx and arm64)]
+python_impl:
+  - pypy               # [not (osx and arm64)]
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -26,6 +26,7 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.8.* *_cpython
+- 3.9.* *_73_pypy
 - 3.9.* *_cpython
 snappy:
 - '1'

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -18,6 +18,7 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.8.* *_cpython
+- 3.9.* *_73_pypy
 - 3.9.* *_cpython
 snappy:
 - '1'

diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,19 +1,19 @@
-channel_priority: strict
 azure:
-  store_build_artifacts: True
   settings_win:
     pool:
       vmImage: windows-2019
+  store_build_artifacts: true
   timeout_minutes: 600
 build_platform:
-  osx_arm64: osx_64
   linux_aarch64: linux_64
-os_version:
-  linux_64: cos7
-test: native_and_emulated
-github:
-  branch_name: main
-  tooling_branch_name: main
+  osx_arm64: osx_64
+channel_priority: strict
 conda_build:
   error_overlinking: true
 conda_forge_output_validation: true
+github:
+  branch_name: main
+  tooling_branch_name: main
+os_version:
+  linux_64: cos7
+test: native_and_emulated
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,35 +1,30 @@
 {% set name = "openvino" %}
 {% set version_postfix = "2023.2.0" %}
-{% set version = "2023.2.0.dev20230922" %}
+{% set version = "2023.2.0.dev20231105" %}
 
 package:
   name: {{ name|lower }}-split
   version: {{ version }}
 
 source:
-  - url: https://github.com/openvinotoolkit/openvino/archive/e7c1344d3c390ae3dd1e827de18a0b76be15e3a5.tar.gz
-    sha256: 620f618403bbc7d7289e1e2e09deca83b91de1f7da27583ea2bf95f94873c421
+  - url: https://github.com/openvinotoolkit/openvino/archive/98072bbbae5e6557a0ea9afbb9e8d9993979a21c.tar.gz
+    sha256: 95e5cd39064fdbba8b23db0f3554e0cfa92cfea3e21094a53812c8781263554d
     patches:
-    - patches/002-win32-python-search.patch
-    - patches/003-lin-arm64-compute-lib.patch  # [aarch64]
-    - patches/004-gflags-samples.patch
+    - patches/003-lin-arm64-compute-lib.patch
   - url: https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v23.08.tar.gz  # [aarch64 or arm64]
     sha256: 62f514a555409d4401e5250b290cdf8cf1676e4eb775e5bd61ea6a740a8ce24f  # [aarch64 or arm64]
     folder: src/plugins/intel_cpu/thirdparty/ComputeLibrary  # [aarch64 or arm64]
-  - url: https://github.com/openvinotoolkit/oneDNN/archive/3767662f257270921b64ec9a40e45a46b4ef048c.tar.gz
-    sha256: 477e3156b77a88f9e77bbbaaf071e19ed19f631972edf902dbefdf8f63062dfd
+  - url: https://github.com/openvinotoolkit/oneDNN/archive/2ead5d4fe5993a797d9a7a4b8b5557b96f6ec90e.tar.gz
+    sha256: 3c51d577f9e7e4cbd94ad08d267502953ec64513241dda6595b2608fafc8314c
     folder: src/plugins/intel_cpu/thirdparty/onednn
-  - url: https://github.com/openvinotoolkit/mlas/archive/c7c8a631315000f17c650af34431009d2f22129c.tar.gz
-    sha256: 7b790dfeef8e1dd612f920c85186c52ad3a3e2245e2a2afd6cc91ce4b1dc64a9
+  - url: https://github.com/openvinotoolkit/mlas/archive/f6425b1394334822390fcd9da12788c9cd0d11da.tar.gz
+    sha256: 707a6634d62ea5563042a67161472b4be3ffe73c9783719519abdd583b0295f4
     folder: src/plugins/intel_cpu/thirdparty/mlas
-  - url: https://github.com/openvinotoolkit/mlas/archive/219f114e988527bb0ecaf2636622562859afa6e1.tar.gz
-    sha256: c97dcca992a4bb24f2936558304bd8ac0ce10d2cb9b8f2f3eadf4d0b14995e93
-    folder: src/plugins/intel_cpu/thirdparty/mlas
-  - url: https://github.com/oneapi-src/oneDNN/archive/4b82a66ed38ecaa993352e5cc6ed7753656b8a26.tar.gz  # [win64 or linux64]
-    sha256: cb17c003fe51bc9b4e20189573956b4446468162adf0fc4cea2ee0820cff0cd0  # [win64 or linux64]
+  - url: https://github.com/oneapi-src/oneDNN/archive/284ad4574939fa784e4ddaa1f4aa577b8eb7a017.tar.gz  # [win64 or linux64]
+    sha256: 16f36078339cd08b949efea1d863344cb0b742d9f5898937d07a591b0c4da517  # [win64 or linux64]
     folder: src/plugins/intel_gpu/thirdparty/onednn_gpu  # [win64 or linux64]
-  - url: https://github.com/opencv/ade/archive/refs/tags/v0.1.2c.tar.gz
-    sha256: 1387891c707c6e5c76448ea09e2df2e8bce1645c11f262c10b3f3ebec88749c2
+  - url: https://github.com/opencv/ade/archive/refs/tags/v0.1.2d.tar.gz
+    sha256: edefba61a33d6cd4b78a9976cb3309c95212610a81ba6dade09882d1794198ff
     folder: thirdparty/ade
   - url: https://github.com/onnx/onnx/archive/refs/tags/v1.14.1.tar.gz
     sha256: e296f8867951fa6e71417a18f2e550a730550f8829bd35e947b4df5e3e777aa1
@@ -496,6 +491,8 @@ outputs:
         - ngraph.opset9
         - ngraph.opset10
         - ngraph.opset11
+        - ngraph.opset12
+        - ngraph.opset13
         - ngraph.utils
         - openvino.inference_engine
         - openvino.runtime
@@ -513,6 +510,8 @@ outputs:
         - openvino.runtime.opset9
         - openvino.runtime.opset10
         - openvino.runtime.opset11
+        - openvino.runtime.opset12
+        - openvino.runtime.opset13
         - openvino.frontend
         - openvino.frontend.onnx
         - openvino.frontend.paddle
@@ -550,7 +549,6 @@ outputs:
         - {{ pin_subpackage('libopenvino-ir-frontend', max_pin='x.x.x') }}
         - {{ pin_subpackage('libopenvino-onnx-frontend', max_pin='x.x.x') }}
         - {{ pin_subpackage('libopenvino-paddle-frontend', max_pin='x.x.x') }}
-        - {{ pin_subpackage('libopenvino-pytorch-frontend', max_pin='x.x.x') }}
         - {{ pin_subpackage('libopenvino-tensorflow-frontend', max_pin='x.x.x') }}
         - {{ pin_subpackage('libopenvino-tensorflow-lite-frontend', max_pin='x.x.x') }}
     requirements:
@@ -560,7 +558,6 @@ outputs:
         # the subpackages below can be linked with
         - {{ pin_subpackage('libopenvino-onnx-frontend', exact=True) }}
         - {{ pin_subpackage('libopenvino-paddle-frontend', exact=True) }}
-        - {{ pin_subpackage('libopenvino-pytorch-frontend', exact=True) }}
         - {{ pin_subpackage('libopenvino-tensorflow-frontend', exact=True) }}
         - {{ pin_subpackage('libopenvino-tensorflow-lite-frontend', exact=True) }}
         # the subpackages below are used as plugins only

diff --git a/recipe/patches/002-win32-python-search.patch b/recipe/patches/002-win32-python-search.patch
diff --git a/recipe/patches/004-gflags-samples.patch b/recipe/patches/004-gflags-samples.patch