Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to openvino 2025.0 RC 3 #93

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Migrate to openvino 2025.0 RC 3 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
936106f
Migrate to openvino 2025.0 RC 3
RHeckerIntel Feb 3, 2025
c526d60
Fix issues with previous commit when upgrading to 2025.0.0
RHeckerIntel Feb 3, 2025
30b5516
Merge branch 'main' into rhecker/openvino_2025.0-rc3
RHeckerIntel Feb 3, 2025
ea03b1c
Attempt to fix macos and linux openvino workflow installation
RHeckerIntel Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
contents: write
uses: ./.github/workflows/build-linux-bindings.yml
with:
OPENVINO_VERSION: '2024.6'
OPENVINO_VERSION: '2025.0'

build-windows-bindings:
permissions:
Expand All @@ -37,7 +37,7 @@ jobs:
contents: write
uses: ./.github/workflows/build-macos-bindings.yml
with:
OPENVINO_VERSION: '2024.6'
OPENVINO_VERSION: '2025.0'

package:
name: Package combined release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-linux-bindings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
- name: Install OpenVINO
run: |
sudo mkdir -p /opt/intel
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.6/linux/openvino_genai_ubuntu22_${{ inputs.OPENVINO_VERSION }}.0.0_x86_64.tar.gz \
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/pre-release/2025.0.0.0rc3/openvino_genai_ubuntu22_2025.0.0.0rc3_x86_64.tar.gz \
--output openvino.tgz && tar -xf openvino.tgz && \
sudo mv openvino_genai_ubuntu22_${{ inputs.OPENVINO_VERSION }}.0.0_x86_64 /opt/intel/openvino && rm openvino.tgz
sudo mv openvino_genai_ubuntu22_${{ inputs.OPENVINO_VERSION }}.0.0rc3_x86_64 /opt/intel/openvino && rm openvino.tgz
cd /opt/intel/openvino && sudo ./install_dependencies/install_openvino_dependencies.sh -y

- name: Cache ffmpeg
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-macos-bindings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:

- name: Install OpenVINO
run: |
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.6/macos/openvino_genai_macos_12_6_2024.6.0.0_arm64.tar.gz \
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/pre-release/2025.0.0.0rc3/openvino_genai_macos_12_6_2025.0.0.0rc3_arm64.tar.gz \
-o /tmp/openvino.tar.gz
sudo mkdir /opt/intel
sudo tar -xvf /tmp/openvino.tar.gz -C /opt/intel
sudo mv /opt/intel/openvino_genai_macos_12_6_${{ inputs.OPENVINO_VERSION }}.0.0_arm64 /opt/intel/openvino
sudo mv /opt/intel/openvino_genai_macos_12_6_${{ inputs.OPENVINO_VERSION }}.0.0rc3_arm64 /opt/intel/openvino
rm /tmp/openvino.tar.gz

- name: Cache ffmpeg
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-windows-bindings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ jobs:
- name: Download and Install OpenVINO Runtime 24.6.0
shell: powershell
run: |
Invoke-WebRequest -Uri https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/2024.6/windows/openvino_genai_windows_2024.6.0.0_x86_64.zip -OutFile openvino_runtime.zip
Invoke-WebRequest -Uri https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/pre-release/2025.0.0.0rc3/openvino_genai_windows_2025.0.0.0rc3_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.6.0.0_x86_64" -NewName "openvino_2024.6.0"
dir C:/Intel/openvino_2024.6.0/
Rename-Item -Path "C:/Intel/openvino_genai_windows_2025.0.0.0rc3_x86_64" -NewName "openvino_2025.0.0"
dir C:/Intel/openvino_2025.0.0/

# Step 11: Install Mediapipe Requirements
- name: Install Mediapipe Requirements
Expand Down
36 changes: 18 additions & 18 deletions macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
0C42C7522CE386520079F72B /* libopenvino_c.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_c.2460.dylib; path = ../bindings/libopenvino_c.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7532CE386520079F72B /* libopenvino_genai.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_genai.2460.dylib; path = ../bindings/libopenvino_genai.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7542CE386520079F72B /* libopenvino_ir_frontend.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_ir_frontend.2460.dylib; path = ../bindings/libopenvino_ir_frontend.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7552CE386520079F72B /* libopenvino_onnx_frontend.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_onnx_frontend.2460.dylib; path = ../bindings/libopenvino_onnx_frontend.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7562CE386520079F72B /* libopenvino_paddle_frontend.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_paddle_frontend.2460.dylib; path = ../bindings/libopenvino_paddle_frontend.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7572CE386520079F72B /* libopenvino_pytorch_frontend.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_pytorch_frontend.2460.dylib; path = ../bindings/libopenvino_pytorch_frontend.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7582CE386520079F72B /* libopenvino_tensorflow_frontend.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_tensorflow_frontend.2460.dylib; path = ../bindings/libopenvino_tensorflow_frontend.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7592CE386520079F72B /* libopenvino_tensorflow_lite_frontend.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_tensorflow_lite_frontend.2460.dylib; path = ../bindings/libopenvino_tensorflow_lite_frontend.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C75A2CE386520079F72B /* libopenvino.2460.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino.2460.dylib; path = ../bindings/libopenvino.2460.dylib; sourceTree = SOURCE_ROOT; };
0C42C7522CE386520079F72B /* libopenvino_c.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_c.2500.dylib; path = ../bindings/libopenvino_c.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7532CE386520079F72B /* libopenvino_genai.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_genai.2500.dylib; path = ../bindings/libopenvino_genai.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7542CE386520079F72B /* libopenvino_ir_frontend.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_ir_frontend.2500.dylib; path = ../bindings/libopenvino_ir_frontend.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7552CE386520079F72B /* libopenvino_onnx_frontend.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_onnx_frontend.2500.dylib; path = ../bindings/libopenvino_onnx_frontend.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7562CE386520079F72B /* libopenvino_paddle_frontend.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_paddle_frontend.2500.dylib; path = ../bindings/libopenvino_paddle_frontend.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7572CE386520079F72B /* libopenvino_pytorch_frontend.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_pytorch_frontend.2500.dylib; path = ../bindings/libopenvino_pytorch_frontend.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7582CE386520079F72B /* libopenvino_tensorflow_frontend.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_tensorflow_frontend.2500.dylib; path = ../bindings/libopenvino_tensorflow_frontend.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C7592CE386520079F72B /* libopenvino_tensorflow_lite_frontend.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino_tensorflow_lite_frontend.2500.dylib; path = ../bindings/libopenvino_tensorflow_lite_frontend.2500.dylib; sourceTree = SOURCE_ROOT; };
0C42C75A2CE386520079F72B /* libopenvino.2500.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvino.2500.dylib; path = ../bindings/libopenvino.2500.dylib; sourceTree = SOURCE_ROOT; };
0C4E1F672CECC22800124339 /* libavcodec.60.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.60.dylib; path = ../bindings/libavcodec.60.dylib; sourceTree = SOURCE_ROOT; };
0C4E1F682CECC22800124339 /* libavdevice.60.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavdevice.60.dylib; path = ../bindings/libavdevice.60.dylib; sourceTree = SOURCE_ROOT; };
0C4E1F692CECC22800124339 /* libavformat.60.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.60.dylib; path = ../bindings/libavformat.60.dylib; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -234,15 +234,15 @@
0C5D476D2C6F397A00307B37 /* libopencv_video.410.dylib */,
0C5D476B2C6F397A00307B37 /* libopencv_videoio.410.dylib */,
0C5D47A32C6F3B7000307B37 /* libtbb.12.dylib */,
0C42C7522CE386520079F72B /* libopenvino_c.2460.dylib */,
0C42C7532CE386520079F72B /* libopenvino_genai.2460.dylib */,
0C42C7542CE386520079F72B /* libopenvino_ir_frontend.2460.dylib */,
0C42C7552CE386520079F72B /* libopenvino_onnx_frontend.2460.dylib */,
0C42C7562CE386520079F72B /* libopenvino_paddle_frontend.2460.dylib */,
0C42C7572CE386520079F72B /* libopenvino_pytorch_frontend.2460.dylib */,
0C42C7582CE386520079F72B /* libopenvino_tensorflow_frontend.2460.dylib */,
0C42C7592CE386520079F72B /* libopenvino_tensorflow_lite_frontend.2460.dylib */,
0C42C75A2CE386520079F72B /* libopenvino.2460.dylib */,
0C42C7522CE386520079F72B /* libopenvino_c.2500.dylib */,
0C42C7532CE386520079F72B /* libopenvino_genai.2500.dylib */,
0C42C7542CE386520079F72B /* libopenvino_ir_frontend.2500.dylib */,
0C42C7552CE386520079F72B /* libopenvino_onnx_frontend.2500.dylib */,
0C42C7562CE386520079F72B /* libopenvino_paddle_frontend.2500.dylib */,
0C42C7572CE386520079F72B /* libopenvino_pytorch_frontend.2500.dylib */,
0C42C7582CE386520079F72B /* libopenvino_tensorflow_frontend.2500.dylib */,
0C42C7592CE386520079F72B /* libopenvino_tensorflow_lite_frontend.2500.dylib */,
0C42C75A2CE386520079F72B /* libopenvino.2500.dylib */,
0C5D47642C6F397900307B37 /* libopencv_ximgproc.410.dylib */,
0C5D473B2C6F357C00307B37 /* libblend2d.dylib */,
0C5D47372C6F2F9500307B37 /* libmacos_bindings.dylib */,
Expand Down
4 changes: 2 additions & 2 deletions openvino_bindings/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,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.6/linux/openvino_genai_ubuntu22_2024.6.0.0_x86_64.tar.gz \
curl -L https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/pre-release/2025.0.0.0rc3/openvino_genai_ubuntu22_2025.0.0.0rc3_x86_64.tar.gz \
--output openvino.tgz && tar -xf openvino.tgz && \
mv openvino_genai_ubuntu22_2024.6.0.0_x86_64 /opt/intel/openvino && rm /tmp/openvino.tgz
mv openvino_genai_ubuntu22_2025.0.0.0rc3_x86_64 /opt/intel/openvino && rm /tmp/openvino.tgz

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

Expand Down
2 changes: 1 addition & 1 deletion openvino_bindings/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ new_local_repository(
new_local_repository(
name = "openvino_windows",
build_file = "//third_party/openvino:windows.BUILD",
path = "C:/Intel/openvino_2024.6.0/runtime",
path = "C:/Intel/openvino_2025.0.0/runtime",
)

new_local_repository(
Expand Down
2 changes: 1 addition & 1 deletion openvino_bindings/third_party/model_api/model_api.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cmake(
],
cache_entries = {
"CMAKE_POSITION_INDEPENDENT_CODE": "ON",
"OpenVINO_DIR": "C:/Intel/openvino_2024.6.0/runtime/cmake",
"OpenVINO_DIR": "C:/Intel/openvino_2025.0.0/runtime/cmake",
"OpenCV_DIR": "C:/opencv/build",
},
lib_source = ":all_srcs",
Expand Down
2 changes: 1 addition & 1 deletion openvino_bindings/third_party/openvino/linux.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package(
default_visibility = ["//visibility:public"],
)

OPENVINO_VERSION = "2460"
OPENVINO_VERSION = "2500"

filegroup(
name = "shared_objects",
Expand Down
2 changes: 1 addition & 1 deletion openvino_bindings/third_party/openvino/mac.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OPENVINO_VERSION = "2460"
OPENVINO_VERSION = "2500"

package(
default_visibility = ["//visibility:public"],
Expand Down
Loading