Skip to content

Commit ac6638f

Browse files
barrypitmanbarrypitman
authored
Merge branch 'master' into codex/update-onnxruntime-to-version-1.26.0
2 parents 820dc92 + 5ba11d9 commit ac6638f

60 files changed

Lines changed: 5957 additions & 10 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/deploy-macosx/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ runs:
6464
6565
# Install vulkan sdk
6666
echo Installing Vulkan SDK
67-
curl -LO https://sdk.lunarg.com/sdk/download/1.3.280.1/mac/vulkansdk-macos-1.3.280.1.dmg
68-
MOUNT_PATH=$(hdiutil mount vulkansdk-macos-1.3.280.1.dmg | tail -n1 | awk '{print $3}')
69-
sudo "${MOUNT_PATH}/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root ~/VulkanSDK/1.3.280.1 --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.core com.lunarg.vulkan.usr com.lunarg.vulkan.sdl2 com.lunarg.vulkan.glm com.lunarg.vulkan.volk com.lunarg.vulkan.vma
67+
curl -LO https://sdk.lunarg.com/sdk/download/1.4.313.1/mac/vulkansdk-macos-1.4.313.1.zip
68+
unzip vulkansdk-macos-1.4.313.1.zip
69+
sudo ./vulkansdk-macOS-1.4.313.1.app/Contents/MacOS/vulkansdk-macOS-1.4.313.1 --root ~/VulkanSDK/1.4.313.1 --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.core com.lunarg.vulkan.usr com.lunarg.vulkan.sdl2 com.lunarg.vulkan.glm com.lunarg.vulkan.volk com.lunarg.vulkan.vma
7070
7171
if [[ -n ${CI_DEPLOY_NEED_BAZEL:-} ]]; then
7272
echo Installing Bazel

‎.github/actions/deploy-ubuntu/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ runs:
147147
echo Installing Vulkan-SDK
148148
if [[ "$CODENAME" == "jammy" ]]; then
149149
curl -s https://packages.lunarg.com/lunarg-signing-key-pub.asc | $SUDO tee /etc/apt/trusted.gpg.d/lunarg.asc >/dev/null
150-
$SUDO curl -s -o /etc/apt/sources.list.d/lunarg-vulkan-1.3.280-jammy.list https://packages.lunarg.com/vulkan/1.3.280/lunarg-vulkan-1.3.280-jammy.list
150+
$SUDO curl -s -o /etc/apt/sources.list.d/lunarg-vulkan-1.4.313-jammy.list https://packages.lunarg.com/vulkan/1.4.313/lunarg-vulkan-1.4.313-jammy.list
151151
$SUDO apt-get update && $SUDO apt-get install -y libvulkan1 libvulkan-dev vulkan-sdk && $SUDO apt-get clean
152152
elif [[ "$CODENAME" == "focal" ]]; then
153153
curl -s https://packages.lunarg.com/lunarg-signing-key-pub.asc | $SUDO apt-key add -
154-
$SUDO curl -s -o /etc/apt/sources.list.d/lunarg-vulkan-1.3.280-focal.list https://packages.lunarg.com/vulkan/1.3.280/lunarg-vulkan-1.3.280-focal.list
154+
$SUDO curl -s -o /etc/apt/sources.list.d/lunarg-vulkan-1.4.313-focal.list https://packages.lunarg.com/vulkan/1.4.313/lunarg-vulkan-1.4.313-focal.list
155155
$SUDO apt-get update && $SUDO apt-get install -y libvulkan1 libvulkan-dev vulkan-sdk && $SUDO apt-get clean
156156
fi
157157

‎.github/actions/deploy-windows/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ runs:
104104
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
105105
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
106106
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
107-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst
108-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst
107+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-headers-1.4.313.0-1-any.pkg.tar.zst
108+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-loader-1.4.313.0-1-any.pkg.tar.zst
109109
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-SDL2-2.30.12-1-any.pkg.tar.zst
110110
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-14.2.0-3-any.pkg.tar.zst
111111
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-14.2.0-3-any.pkg.tar.zst
@@ -124,8 +124,8 @@ runs:
124124
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
125125
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
126126
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
127-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst
128-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst
127+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-headers-1.4.313.0-1-any.pkg.tar.zst
128+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-loader-1.4.313.0-1-any.pkg.tar.zst
129129
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-SDL2-2.30.12-1-any.pkg.tar.zst
130130
bash -c "pacman -Rc --noconfirm mingw-w64-x86_64-gdb-multiarch mingw-w64-x86_64-gdb mingw-w64-x86_64-libb2 mingw-w64-x86_64-python"
131131
bash -c "pacman -U --noconfirm *.pkg.tar.zst"

‎.github/workflows/openvino.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: openvino
2+
on:
3+
push:
4+
paths:
5+
- openvino/**
6+
- .github/workflows/openvino.yml
7+
pull_request:
8+
paths:
9+
- openvino/**
10+
- .github/workflows/openvino.yml
11+
workflow_dispatch:
12+
env:
13+
CI_DEPLOY_MODULE: ${{ github.workflow }}
14+
CI_DEPLOY_PLATFORM: ${{ github.job }}
15+
CI_DEPLOY_SETTINGS: ${{ secrets.CI_DEPLOY_SETTINGS }}
16+
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
17+
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
18+
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
19+
jobs:
20+
linux-x86_64:
21+
runs-on: ubuntu-22.04
22+
steps:
23+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
24+
macosx-arm64:
25+
runs-on: macos-15
26+
steps:
27+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
28+
windows-x86_64:
29+
runs-on: windows-2022
30+
steps:
31+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
32+
platform:
33+
needs: [linux-x86_64, macosx-arm64, windows-x86_64]
34+
runs-on: ubuntu-22.04
35+
steps:
36+
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
* Add presets for OpenVINO 2026.1.0 ([pull #1752](https://github.com/bytedeco/javacpp-presets/pull/1752))
23
* Allow creating new `std::vector<torch::optim::OptimizerParamGroup>` in presets for PyTorch ([issue #1756](https://github.com/bytedeco/javacpp-presets/issues/1756))
34
* Add V4L2 Request API hwaccels in presets for FFmpeg ([pull #1755](https://github.com/bytedeco/javacpp-presets/pull/1755))
45
* Add new `SampleOnnxMNIST` in samples for TensorRT ([pull #1742](https://github.com/bytedeco/javacpp-presets/pull/1742))

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ JavaCPP Presets
5454
[![depthai](https://github.com/bytedeco/javacpp-presets/workflows/depthai/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Adepthai)
5555
[![onnx](https://github.com/bytedeco/javacpp-presets/workflows/onnx/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Aonnx)
5656
[![ngraph](https://github.com/bytedeco/javacpp-presets/workflows/ngraph/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Angraph)
57+
[![openvino](https://github.com/bytedeco/javacpp-presets/workflows/openvino/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Aopenvino)
5758
[![onnxruntime](https://github.com/bytedeco/javacpp-presets/workflows/onnxruntime/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Aonnxruntime)
5859
[![tvm](https://github.com/bytedeco/javacpp-presets/workflows/tvm/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Atvm)
5960
[![bullet](https://github.com/bytedeco/javacpp-presets/workflows/bullet/badge.svg)](https://github.com/bytedeco/javacpp-presets/actions?query=workflow%3Abullet)
@@ -234,6 +235,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
234235
* DepthAI 2.24.x https://github.com/luxonis/depthai-core
235236
* ONNX 1.20.x https://github.com/onnx/onnx
236237
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
238+
* OpenVINO 2026.1.x https://github.com/openvinotoolkit/openvino
237239
* ONNX Runtime 1.26.x https://github.com/microsoft/onnxruntime
238240
* TVM 0.18.x https://github.com/apache/tvm
239241
* Bullet Physics SDK 3.25 https://pybullet.org

‎cppbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ function sedinplace {
159159
}
160160

161161
if [[ -z ${PROJECTS:-} ]]; then
162-
PROJECTS=(opencv ffmpeg flycapture spinnaker libdc1394 libfreenect libfreenect2 librealsense librealsense2 videoinput artoolkitplus chilitags flandmark arrow hdf5 hyperscan lz4 mkl mkl-dnn dnnl openblas arpack-ng cminpack fftw gsl cpython numpy scipy gym llvm libpostal libraw leptonica tesseract caffe openpose cuda nvcodec opencl mxnet pytorch sentencepiece tensorflow tensorflow-lite tensorrt tritonserver depthai ale onnx ngraph onnxruntime tvm bullet liquidfun qt skia cpu_features modsecurity systems)
162+
PROJECTS=(opencv ffmpeg flycapture spinnaker libdc1394 libfreenect libfreenect2 librealsense librealsense2 videoinput artoolkitplus chilitags flandmark arrow hdf5 hyperscan lz4 mkl mkl-dnn dnnl openblas arpack-ng cminpack fftw gsl cpython numpy scipy gym llvm libpostal libraw leptonica tesseract caffe openpose cuda nvcodec opencl mxnet pytorch sentencepiece tensorflow tensorflow-lite tensorrt tritonserver depthai ale onnx ngraph openvino onnxruntime tvm bullet liquidfun qt skia cpu_features modsecurity systems)
163163
fi
164164

165165
for PROJECT in ${PROJECTS[@]}; do

‎openvino/README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# OpenVINO
2+
3+
The [OpenVINO](https://github.com/openvinotoolkit/openvino) preset packages the OpenVINO Runtime C API and shared libraries.
4+
5+
Supported platforms:
6+
- `linux-x86_64`
7+
- `windows-x86_64`
8+
- `macosx-arm64`
9+
10+
The packaged runtime includes the CPU, GPU, and NPU plugin shared libraries from the official OpenVINO wheel distribution.
11+
12+
## Sample
13+
14+
A minimal sample is available under `openvino/samples/`:
15+
16+
```bash
17+
mvn -f openvino/samples/pom.xml compile exec:java
18+
```

‎openvino/cppbuild.sh‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/bin/bash
2+
# This file is meant to be included by the parent cppbuild.sh script
3+
if [[ -z "$PLATFORM" ]]; then
4+
pushd ..
5+
bash cppbuild.sh "$@" openvino
6+
popd
7+
exit
8+
fi
9+
10+
OPENVINO_VERSION=2026.1.0
11+
OPENVINO_BUILD=21367.63e31528c62
12+
OPENVINO_PACKAGES_URL=https://storage.openvinotoolkit.org/repositories/openvino/packages/2026.1
13+
14+
mkdir -p "$PLATFORM"
15+
cd "$PLATFORM"
16+
17+
archive_name=
18+
archive_platform=
19+
archive_root=
20+
21+
case $PLATFORM in
22+
linux-x86_64)
23+
archive_name=openvino_toolkit_ubuntu22_${OPENVINO_VERSION}.${OPENVINO_BUILD}_x86_64.tgz
24+
archive_platform=linux
25+
archive_root=${archive_name%.tgz}
26+
;;
27+
macosx-arm64)
28+
archive_name=openvino_toolkit_macos_12_6_${OPENVINO_VERSION}.${OPENVINO_BUILD}_arm64.tgz
29+
archive_platform=macos
30+
archive_root=${archive_name%.tgz}
31+
;;
32+
windows-x86_64)
33+
archive_name=openvino_toolkit_windows_${OPENVINO_VERSION}.${OPENVINO_BUILD}_x86_64.zip
34+
archive_platform=windows
35+
archive_root=${archive_name%.zip}
36+
;;
37+
*)
38+
echo "Error: Platform \"$PLATFORM\" is not supported"
39+
exit 1
40+
;;
41+
esac
42+
43+
download "${OPENVINO_PACKAGES_URL}/${archive_platform}/${archive_name}" "${archive_name}"
44+
45+
case "$archive_name" in
46+
*.tgz)
47+
tar -xzf "$archive_name" --strip-components=1 "${archive_root}/runtime"
48+
;;
49+
*.zip)
50+
unzip -q -o "$archive_name"
51+
if [[ -d "$archive_root/runtime" ]]; then
52+
mv "$archive_root/runtime" .
53+
rm -rf "$archive_root"
54+
fi
55+
;;
56+
*)
57+
echo "Error: Unsupported archive \"$archive_name\""
58+
exit 1
59+
;;
60+
esac
61+
62+
cd ..

0 commit comments

Comments
 (0)