Skip to content

Commit

Permalink
2023.1.0 (conda-forge#42)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
4 people authored Sep 18, 2023
1 parent 2e31623 commit efdb9a6
Show file tree
Hide file tree
Showing 25 changed files with 522 additions and 319 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gflags:
- '2.2'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
snappy:
- '1'
target_platform:
Expand Down
11 changes: 11 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gflags:
- '2.2'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
snappy:
- '1'
target_platform:
Expand Down
37 changes: 37 additions & 0 deletions .ci_support/migrations/python311.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
migrator_ts: 1666686085
__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.11.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 40
max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false

python:
- 3.11.* *_cpython
# additional entries to add for zip_keys
numpy:
- 1.23
python_impl:
- cpython
11 changes: 11 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ gflags:
- '2.2'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
snappy:
- '1'
target_platform:
Expand Down
11 changes: 11 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ gflags:
- '2.2'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
snappy:
- '1'
target_platform:
Expand Down
11 changes: 11 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ cxx_compiler:
- vs2019
gflags:
- '2.2'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
snappy:
- '1'
target_platform:
Expand Down
40 changes: 32 additions & 8 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ azure:
pool:
vmImage: windows-2019
store_build_artifacts: true
timeout_minutes: 600
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_64
Expand Down
3 changes: 2 additions & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ cmake ^
-DENABLE_SYSTEM_OPENCL=ON ^
-DENABLE_SYSTEM_PROTOBUF=ON ^
-DENABLE_SYSTEM_SNAPPY=ON ^
-DENABLE_COMPILE_TOOL=OFF ^
-DENABLE_PYTHON=OFF ^
-DENABLE_CPPLINT=OFF ^
-DENABLE_CLANG_FORMAT=OFF ^
-DENABLE_NCC_STYLE=OFF ^
-DENABLE_TEMPLATE=OFF ^
-DENABLE_SAMPLES=OFF ^
-DENABLE_DATA=OFF ^
-DCMAKE_CXX_FLAGS="/wd4996" ^
-DCMAKE_C_FLAGS="/wd4996" ^
-DCPACK_GENERATOR=CONDA-FORGE ^
-G "Visual Studio 16 2019" ^
-S "%SRC_DIR%" ^
Expand Down
3 changes: 2 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ cmake ${CMAKE_ARGS} \
-DENABLE_SYSTEM_PUGIXML=ON \
-DENABLE_SYSTEM_PROTOBUF=ON \
-DENABLE_SYSTEM_SNAPPY=ON \
-DENABLE_COMPILE_TOOL=OFF \
-DENABLE_PYTHON=OFF \
-DENABLE_CPPLINT=OFF \
-DENABLE_CLANG_FORMAT=OFF \
-DENABLE_NCC_STYLE=OFF \
-DENABLE_TEMPLATE=OFF \
-DENABLE_SAMPLES=OFF \
-DENABLE_DATA=OFF \
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
-DCMAKE_C_FLAGS="-Wno-deprecated-declarations" \
-DCPACK_GENERATOR=CONDA-FORGE \
-G Ninja \
-S "$SRC_DIR" \
Expand Down
10 changes: 10 additions & 0 deletions recipe/install/install_python.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# !/usr/bin/env bash

export OPENVINO_BINARY_DIR="$SRC_DIR/build"
export PY_PACKAGES_DIR="lib/python$PY_VER/site-packages"
export WHEEL_VERSION="$PKG_VERSION"
export PYTHON_EXTENSIONS_ONLY="1"
export SKIP_RPATH="1"
export CPACK_GENERATOR="CONDA-FORGE"

$PYTHON -m pip install --no-deps --ignore-installed -v "$SRC_DIR/src/bindings/python/wheel"
Loading

0 comments on commit efdb9a6

Please sign in to comment.