Skip to content

Commit

Permalink
Bump to 24.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ArendJanKramer committed Nov 6, 2024
1 parent a7f7b7d commit e95db0c
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 29 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/windows-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ jobs:
shell: cmd

# Step 10: Download and Install OpenVINO Runtime
- name: Download and Install OpenVINO Runtime 24.4.0
- name: Download and Install OpenVINO Runtime 24.5.0
shell: powershell
run: |
Invoke-WebRequest -Uri https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.4/windows/openvino_genai_windows_2024.4.0.0_x86_64.zip -OutFile openvino_runtime.zip
Invoke-WebRequest -Uri https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/nightly/2025.0.0.0.dev20241105/openvino_genai_windows_2025.0.0.0.dev20241105_x86_64.zip -OutFile openvino_runtime.zip
Expand-Archive -Path openvino_runtime.zip -DestinationPath C:/Intel/
Rename-Item -Path "C:/Intel/openvino_genai_windows_2024.4.0.0_x86_64" -NewName "openvino_2024.4.0"
dir C:/Intel/openvino_2024.4.0/
Rename-Item -Path "C:/Intel/openvino_genai_windows_2024.5.0.0_x86_64" -NewName "openvino_2024.5.0"
dir C:/Intel/openvino_2024.5.0/
# Step 11: Install Mediapipe Requirements
- name: Install Mediapipe Requirements
Expand Down
4 changes: 2 additions & 2 deletions openvino_bindings/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_V
rm -f /bazel/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh

RUN cd /tmp && mkdir -p /opt/intel && \
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.4/linux/openvino_genai_ubuntu22_2024.4.0.0_x86_64.tar.gz \
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/nightly/2025.0.0.0.dev20241105/openvino_genai_ubuntu22_2025.0.0.0.dev20241105_x86_64.tar.gz \
--output openvino.tgz && tar -xf openvino.tgz && \
mv openvino_genai_ubuntu22_2024.4.0.0_x86_64 /opt/intel/openvino && rm /tmp/openvino.tgz
mv openvino_genai_ubuntu22_2024.5.0.0_x86_64 /opt/intel/openvino && rm /tmp/openvino.tgz

RUN cd /opt/intel/openvino && ./install_dependencies/install_openvino_dependencies.sh -y

Expand Down
6 changes: 3 additions & 3 deletions openvino_bindings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Further dependencies which are explained per platform below:

A step by step guide can be found [here]('./docs/WINDOWS.md').

[Install OpenVINO Runtime 24.4.0]( https://docs.openvino.ai/2024/get-started/install-openvino.html?PACKAGE=OPENVINO_GENAI&VERSION=v_2024_4_0&OP_SYSTEM=WINDOWS&DISTRIBUTION=ARCHIVE) with GenAI flavor in `C:/Intel/openvino_24.4.0`.
[Install OpenVINO Runtime 24.5.0]( https://docs.openvino.ai/2024/get-started/install-openvino.html?PACKAGE=OPENVINO_GENAI&VERSION=v_2024_4_0&OP_SYSTEM=WINDOWS&DISTRIBUTION=ARCHIVE) with GenAI flavor in `C:/Intel/openvino_24.5.0`.

Build OpenCV in `C:/opencv/build`.
Install ffmpeg: `vcpkg install ffmpeg`.
Expand All @@ -105,7 +105,7 @@ The DLLs (with dependencies) will be in `bazel-bin/windows_bindings.tar`

### MacOS

[Install OpenVINO Runtime 24.4.0](https://docs.openvino.ai/2024/get-started/install-openvino.html?PACKAGE=OPENVINO_GENAI&VERSION=v_2024_4_0&OP_SYSTEM=MACOS&DISTRIBUTION=ARCHIVE) with GenAI flavor in `/opt/intel/openvino_24.4.0` and symlink to `/opt/intel/openvino`.
[Install OpenVINO Runtime 24.5.0](https://docs.openvino.ai/2024/get-started/install-openvino.html?PACKAGE=OPENVINO_GENAI&VERSION=v_2024_4_0&OP_SYSTEM=MACOS&DISTRIBUTION=ARCHIVE) with GenAI flavor in `/opt/intel/openvino_24.5.0` and symlink to `/opt/intel/openvino`.

Install OpenCV: `brew install opencv`
Install ffmpeg: `brew install ffmpeg@6`
Expand All @@ -116,7 +116,7 @@ The .dylib and .so are located in `bazel-bin/macos_bindings.tar`.

### Linux

[Install OpenVINO Runtime 24.4.0](https://docs.openvino.ai/2024/get-started/install-openvino.html?PACKAGE=OPENVINO_GENAI&VERSION=v_2024_4_0&OP_SYSTEM=LINUX&DISTRIBUTION=ARCHIVE) with GenAI flavor in `/opt/intel/openvino_24.4.0` and symlink to `/opt/intel/openvino`.
[Install OpenVINO Runtime 24.5.0](https://docs.openvino.ai/2024/get-started/install-openvino.html?PACKAGE=OPENVINO_GENAI&VERSION=v_2024_4_0&OP_SYSTEM=LINUX&DISTRIBUTION=ARCHIVE) with GenAI flavor in `/opt/intel/openvino_24.5.0` and symlink to `/opt/intel/openvino`.

Build or install OpenCV to `/usr/local/`.
Install ffmpeg: `sudo apt-get install ffmpeg`.
Expand Down
42 changes: 25 additions & 17 deletions openvino_bindings/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@

workspace(name = "console_bindings")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

bind(
name = "python_headers",
actual = "@local_config_python//:python_headers",
)


########################################################### Compile_commands

# Hedron's Compile Commands Extractor for Bazel
# https://github.com/hedronvision/bazel-compile-commands-extractor
http_archive(
name = "hedron_compile_commands",
strip_prefix = "bazel-compile-commands-extractor-0e990032f3c5a866e72615cf67e5ce22186dcb97",

# Replace the commit hash (0e990032f3c5a866e72615cf67e5ce22186dcb97) in both places (below) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main), rather than using the stale one here.
# Even better, set up Renovate and let it do the work for you (see "Suggestion: Updates" in the README).
url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/0e990032f3c5a866e72615cf67e5ce22186dcb97.tar.gz",
strip_prefix = "bazel-compile-commands-extractor-0e990032f3c5a866e72615cf67e5ce22186dcb97",
# When you first run this tool, it'll recommend a sha256 hash to put here with a message like: "DEBUG: Rule 'hedron_compile_commands' indicated that a canonical reproducible form can be obtained by modifying arguments sha256 = ..."
)

load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")

hedron_compile_commands_setup()

new_local_repository(
Expand All @@ -36,7 +35,7 @@ new_local_repository(
new_local_repository(
name = "openvino_windows",
build_file = "//third_party/openvino:windows.BUILD",
path = "C:/Intel/openvino_2024.4.0/runtime",
path = "C:/Intel/openvino_2024.5.0/runtime",
)

new_local_repository(
Expand All @@ -47,26 +46,26 @@ new_local_repository(

git_repository(
name = "rules_foreign_cc",
remote = "https://github.com/bazelbuild/rules_foreign_cc.git",
commit = "9d5727d5e51bf1be8423dff7996bdb4d847b47e6",
# strip_prefix = "rules_foreign_cc-0.9.0",
remote = "https://github.com/bazelbuild/rules_foreign_cc.git",
# strip_prefix = "rules_foreign_cc-0.9.0",
)

load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")

rules_foreign_cc_dependencies(cmake_version="3.26.2")
rules_foreign_cc_dependencies(cmake_version = "3.26.2")

git_repository(
name = "gtest",
remote = "https://github.com/google/googletest",
branch = "v1.15.x",
remote = "https://github.com/google/googletest",
)

git_repository(
name = "model_api",
remote = "https:///github.com/openvinotoolkit/model_api/",
build_file = "//third_party/model_api:model_api.BUILD",
commit = "eb9fcfb1e1eebc047ff144707f76203b132e1aa6"
commit = "eb9fcfb1e1eebc047ff144707f76203b132e1aa6",
remote = "https:///github.com/openvinotoolkit/model_api/",
)

new_local_repository(
Expand All @@ -89,16 +88,16 @@ new_local_repository(

git_repository(
name = "asmjit",
remote = "https://github.com/asmjit/asmjit",
commit = "330aa64386f394e090eb1062c645f9d021a761bc",
build_file = "//third_party:asmjit.BUILD",
commit = "330aa64386f394e090eb1062c645f9d021a761bc",
remote = "https://github.com/asmjit/asmjit",
)

git_repository(
name = "blend2d",
remote = "https://github.com/blend2d/blend2d",
commit = "c08b6c3c08d6cadf033e27fd108a494200ec0da1",
build_file = "//third_party:blend2d.BUILD",
commit = "c08b6c3c08d6cadf033e27fd108a494200ec0da1",
remote = "https://github.com/blend2d/blend2d",
)

git_repository(
Expand All @@ -116,7 +115,7 @@ git_repository(
new_local_repository(
name = "mac_ffmpeg",
build_file = "//third_party/ffmpeg:mac.BUILD",
path = "/opt/homebrew/Cellar/ffmpeg@6/6.1.2_3"
path = "/opt/homebrew/Cellar/ffmpeg@6/6.1.2_3",
)
#
#new_local_repository(
Expand All @@ -127,33 +126,42 @@ new_local_repository(

http_archive(
name = "rules_pkg",
sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
"https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
],
sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
)

load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")

rules_pkg_dependencies()

load("//bazel:mediapipe_deps.bzl", "mediapipe_deps")

mediapipe_deps()

#load("@rules_python//python:repositories.bzl", "py_repositories")

load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")

build_bazel_rules_nodejs_dependencies()

# fetches nodejs, npm, and yarn
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")

node_repositories()

yarn_install(
name = "npm",
package_json = "@mediapipe//:package.json",
yarn_lock = "@mediapipe//:yarn.lock",
)

load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")

tf_workspace3()

load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2")

tf_workspace2()
2 changes: 1 addition & 1 deletion openvino_bindings/docs/WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Check C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MS

## OpenVINO

[Install OpenVINO with GenAI](https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.4/windows) and install to `C:\Intel\openvino_2024.4.0`
[Install OpenVINO with GenAI](https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.5/windows) and install to `C:\Intel\openvino_2024.5.0`



2 changes: 1 addition & 1 deletion openvino_bindings/third_party/model_api/model_api.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ cmake(
],
cache_entries = {
"CMAKE_POSITION_INDEPENDENT_CODE": "ON",
"OpenVINO_DIR": "C:/Intel/openvino_2024.4.0/runtime/cmake",
"OpenVINO_DIR": "C:/Intel/openvino_2024.5.0/runtime/cmake",
"OpenCV_DIR": "C:/opencv/build",
},
#env = {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ msix_config:
display_name: OpenVINO Test Drive
publisher_display_name: Intel
identity_name: intel.openvino.testdrive
msix_version: 24.4.0.0
msix_version: 24.5.0.0
trim_logo: false
capabilities: "internetClient"
logo_path: "images/openvino_eye.png"
Expand Down

0 comments on commit e95db0c

Please sign in to comment.