Skip to content

Commit

Permalink
Added libopenvino-dev dependency on tbb-devel (conda-forge#61)
Browse files Browse the repository at this point in the history
* Added libopenvino-dev dependency on tbb-devel

* MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.11.21.29.17

* Removed TBB pinning

* Update recipe/meta.yaml

Co-authored-by: Mark Harfouche <mark.harfouche@gmail.com>

* MNT: Re-rendered with conda-build 3.28.3, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.12.13.33.06

* Update recipe/meta.yaml

* Update meta.yaml

* Update recipe/meta.yaml

* add tbb-devel to the host section

---------

Co-authored-by: Mark Harfouche <mark.harfouche@gmail.com>
Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 13, 2024
1 parent 200a7c7 commit 0e57656
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 40 deletions.
2 changes: 2 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flatbuffers:
- 23.5.26
gflags:
- '2.2'
pin_run_as_build:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flatbuffers:
- 23.5.26
gflags:
- '2.2'
pin_run_as_build:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
flatbuffers:
- 23.5.26
gflags:
- '2.2'
macos_machine:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
flatbuffers:
- 23.5.26
gflags:
- '2.2'
macos_machine:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
flatbuffers:
- 23.5.26
gflags:
- '2.2'
pin_run_as_build:
Expand Down
25 changes: 23 additions & 2 deletions .gitignore

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

12 changes: 3 additions & 9 deletions .scripts/build_steps.sh

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh

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

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

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

8 changes: 5 additions & 3 deletions .scripts/run_win_build.bat

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

2 changes: 1 addition & 1 deletion README.md

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

49 changes: 27 additions & 22 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ source:


build:
number: 0
number: 1

requirements:
build:
Expand All @@ -56,15 +56,15 @@ requirements:
- python >=3.7
- ccache
- libprotobuf =3.20.3 # for protoc compiler, libraries are used from libprotobuf-static
- flatbuffers =23.3.3
- flatbuffers
- sysroot_linux-64 =2.17 # [linux64]
host:
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- tbb-devel
- snappy
- ocl-icd # [linux64]
- clhpp # [linux64 or win64]
- khronos-opencl-icd-loader # [win64]
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- pugixml
- xbyak >=6.69.1 # [x86_64]
- libprotobuf-static =3.20.3 # [not win64]
- libprotobuf-static # [win64]
Expand All @@ -89,8 +89,8 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- pugixml
- tbb-devel
test:
commands:
{% set openvino_libs = [] %}
Expand Down Expand Up @@ -123,7 +123,7 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- pugixml
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand Down Expand Up @@ -236,7 +236,7 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- snappy =1.1.10
- snappy
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand Down Expand Up @@ -292,8 +292,8 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- pugixml
- tbb-devel
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand All @@ -320,8 +320,8 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- pugixml
- tbb-devel
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand All @@ -347,11 +347,11 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- tbb-devel
- ocl-icd # [linux64]
- clhpp
- khronos-opencl-icd-loader # [win64]
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- pugixml
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand All @@ -377,7 +377,7 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- tbb-devel
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand Down Expand Up @@ -426,7 +426,7 @@ outputs:
- {{ compiler('c') }}
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
- pugixml >=1.12.1 # starting from this version shared libraries are provided
- pugixml
- {{ pin_subpackage('libopenvino', exact=True) }}
run:
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand Down Expand Up @@ -466,8 +466,8 @@ outputs:
- pybind11 >=2.10.1 # this versions works well for cross-compilation
- wheel
host:
- tbb-devel =2021.5 # for developer package only
- pugixml >=1.12.1 # for developer package only
- tbb-devel # for developer package only
- pugixml # for developer package only
- python
- pip
- {{ pin_subpackage('libopenvino', exact=True) }}
Expand Down Expand Up @@ -548,6 +548,7 @@ outputs:
- runtime-third-party-programs.txt
build:
run_exports:
- {{ pin_subpackage('libopenvino', max_pin='x.x.x') }}
- {{ pin_subpackage('libopenvino-intel-cpu-plugin', max_pin='x.x.x') }} # [x86_64]
- {{ pin_subpackage('libopenvino-arm-cpu-plugin', max_pin='x.x.x') }} # [aarch64 or arm64]
- {{ pin_subpackage('libopenvino-intel-gpu-plugin', max_pin='x.x.x') }} # [win64 or linux64]
Expand All @@ -563,6 +564,11 @@ outputs:
requirements:
build:
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
host:
# hmaarrfk: 2024/01
# without the tbb-devel package in the host section, we won't be able to drag on
# the comaptible dependency below
- tbb-devel
run:
# the subpackages below can be linked with
- {{ pin_subpackage('libopenvino-onnx-frontend', exact=True) }}
Expand All @@ -578,6 +584,7 @@ outputs:
- {{ pin_subpackage('libopenvino-auto-plugin', exact=True) }}
- {{ pin_subpackage('libopenvino-hetero-plugin', exact=True) }}
- {{ pin_subpackage('libopenvino-auto-batch-plugin', exact=True) }}
- {{ pin_compatible('tbb-devel', max_pin='x') }} # to property find libs via openvino.pc
test:
requires:
- {{ compiler('cxx') }}
Expand All @@ -588,7 +595,6 @@ outputs:
- zlib
- nlohmann_json
- sysroot_linux-64 =2.17 # [linux64]
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
- gflags
source_files:
- samples
Expand Down Expand Up @@ -647,7 +653,7 @@ outputs:
- cmake --build samples_c_build --config Release --verbose # [win]

# check that devices are found using OpenVINO C API
- $CC snippets/openvino_available_devices.c $(pkg-config --cflags --libs pugixml tbb openvino) -Wl,-rpath,$PREFIX/lib -o openvino_devices_test # [unix]
- $CC snippets/openvino_available_devices.c $(pkg-config --cflags --libs openvino) -Wl,-rpath,$PREFIX/lib -o openvino_devices_test # [unix]
- if [[ $(./openvino_devices_test) != "passed" ]]; then exit 1 ; fi # [unix]

# check that frontends are found using OpenVINO C++ API
Expand Down Expand Up @@ -695,15 +701,14 @@ outputs:
- pkg-config
- cmake >=3.15 # to have new cmake cmd interface (-S, --install and other options)
- sysroot_linux-64 =2.17 # [linux64]
- tbb-devel =2021.5 # starting from this version TBB uses hwloc in conda
files:
- snippets/
commands:
# check that devices and frontends are found using Python API
- $PYTHON snippets/openvino_available_components.py # [unix]

# check that devices are found using OpenVINO C API
- $CC snippets/openvino_available_devices.c $(pkg-config --cflags --libs pugixml tbb openvino) -Wl,-rpath,$PREFIX/lib -o openvino_devices_test # [unix]
- $CC snippets/openvino_available_devices.c $(pkg-config --cflags --libs openvino) -Wl,-rpath,$PREFIX/lib -o openvino_devices_test # [unix]
- if [[ $(./openvino_devices_test) != "passed" ]]; then exit 1 ; fi # [unix]

# check that frontends are found using OpenVINO C++ API
Expand Down

0 comments on commit 0e57656

Please sign in to comment.