2023.1.0.dev20230811 pre-release (#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
conda-forge · Aug 17, 2023 · 03c87cc · 03c87cc
1 parent 7441b65
commit 03c87cc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,29 +1,30 @@
 {% set name = "openvino" %}
 {% set version_postfix = "2023.1.0" %}
-{% set version = "2023.1.0.dev20230728" %}
+{% set version = "2023.1.0.dev20230811" %}
 
 package:
   name: {{ name|lower }}-split
   version: {{ version }}
 
 source:
-  - url: https://github.com/openvinotoolkit/openvino/archive/refs/tags/2023.1.0.dev20230728.tar.gz
-    sha256: 11caac86d0a76fcc53fc423c5da244e3c72bc8786a5af9234545f39fb19e3a04
+  - url: https://github.com/openvinotoolkit/openvino/archive/refs/tags/2023.1.0.dev20230811.tar.gz
+    sha256: 8bbe23019034e8f1a3751648ad5404142b3285c392031573cb9bdbd47d4716a3
     patches:
     - patches/002-win32-python-search.patch
     - patches/003-lin-arm64-compute-lib.patch  # [aarch64]
     - patches/004-gflags-samples.patch
+    - patches/005-wheel-package.patch
   - url: https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v23.02.1.tar.gz  # [aarch64 or arm64]
     sha256: c3a443e26539f866969242e690cf0651ef629149741ee18732f954c734da6763  # [aarch64 or arm64]
     folder: src/plugins/intel_cpu/thirdparty/ComputeLibrary  # [aarch64 or arm64]
-  - url: https://github.com/openvinotoolkit/oneDNN/archive/5bf389f616d0b1551ce468f2712df492a7aab140.tar.gz
-    sha256: 31af79c5b25a01ae795ad03e0745d238f0459b6e79844c33f5cf8b549d005393
+  - url: https://github.com/openvinotoolkit/oneDNN/archive/6b6f9fcebf840c665e1db4361f75c42ac77e5e72.tar.gz
+    sha256: adc981b4dbd8f9d02b29e2035a9a2431fc63d93aa2e7ddd944a8f96f3664bc4a
     folder: src/plugins/intel_cpu/thirdparty/onednn
-  - url: https://github.com/openvinotoolkit/mlas/archive/519abf79de5ee295cfe5bbed97037a2623616c80.tar.gz  # [not aarch64 and not arm64]
-    sha256: ef681b16a0f8b325aa01ab94d252f4cbd2f4848d8a1f8a3f2bd12ee76b241238  # [not aarch64 and not arm64]
-    folder: src/plugins/intel_cpu/thirdparty/mlas  # [not aarch64 and not arm64]
-  - url: https://github.com/oneapi-src/oneDNN/archive/ec0b2ee85fc2a2dbdeec10035c5ef5813d8fb5ea.tar.gz  # [win64 or linux64]
-    sha256: 8d84c7567803bf30e3a8fec9bf14e33b2003f73545160ddd1cf0406c4c7fb3d5  # [win64 or linux64]
+  - 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]
     folder: src/plugins/intel_gpu/thirdparty/onednn_gpu  # [win64 or linux64]
   - url: https://github.com/opencv/ade/archive/58b2595a1a95cc807be8bf6222f266a9a1f393a9.tar.gz
     sha256: db7759cc32107e713b9e503ddf71a54ba2c80de07daefcb1aa315507e706ce07
@@ -33,7 +34,7 @@ source:
     folder: thirdparty/onnx/onnx
 
 build:
-  number: 1
+  number: 0
 
 requirements:
   build:
@@ -474,6 +475,7 @@ outputs:
         - {{ pin_subpackage('libopenvino-pytorch-frontend', exact=True) }}
         - {{ pin_subpackage('libopenvino-tensorflow-frontend', exact=True) }}
         - numpy >=1.16.6
+        - openvino-telemetry >=2023.1.1
         - singledispatchmethod  # [py <= 37]
         - python
     test:
@@ -514,10 +516,10 @@ outputs:
         - openvino.frontend.tensorflow
         - openvino.preprocess
       commands:
-        # - pip check # fails before of openvino-telemetry
+        - pip check
         - ovc --help
         - benchmark_app --help
-        - test $(pip list | grep openvino | wc -l) -eq 1  # [unix]
+        - test $(pip list | grep openvino | wc -l) -eq 2  # [unix]
         - if [[ $($PYTHON -c 'import openvino.runtime as ov; print(ov.__version__[0:8])') != {{ version_postfix }} ]]; then exit 1; fi  # [unix]
         - if [[ $($PYTHON -c 'from openvino.frontend import FrontEndManager as fem; print(len(fem().get_available_front_ends()))') != 4 ]]; then exit 1; fi  # [unix]
       requires:

diff --git a/recipe/patches/005-wheel-package.patch b/recipe/patches/005-wheel-package.patch
@@ -0,0 +1,13 @@
+diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
+index ee0de58d68..4dc269a586 100644
+--- a/src/bindings/python/wheel/setup.py
++++ b/src/bindings/python/wheel/setup.py
+@@ -615,6 +615,8 @@ def concat_files(input_files, output_file):
+
+ OPENVINO_VERSION = WHEEL_VERSION = os.getenv("WHEEL_VERSION", "0.0.0")
+ PACKAGE_DIR = get_package_dir(PY_INSTALL_CFG)
++os.makedirs(PACKAGE_DIR, exist_ok=True)
++
+ packages = find_namespace_packages(PACKAGE_DIR)
+ package_data: typing.Dict[str, list] = {}
+ ext_modules = find_prebuilt_extensions(get_install_dirs_list(PY_INSTALL_CFG))