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

support for OPENVINO 2024.0 (#75) #78

Merged
merged 1 commit into from
May 8, 2024
Merged

support for OPENVINO 2024.0 (#75) #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Follow the steps below to build the backend shared library.
```
$ mkdir build
$ cd build
$ cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install -DTRITON_BUILD_OPENVINO_VERSION=2021.2.200 -DTRITON_BUILD_CONTAINER_VERSION=20.12 ..
$ cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install -DTRITON_BUILD_OPENVINO_VERSION=2024.0.0 -DTRITON_BUILD_CONTAINER_VERSION=24.03 ..
$ make install
```

Expand Down
23 changes: 11 additions & 12 deletions tools/gen_openvino_dockerfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def dockerfile_for_linux(output_file):
RUN apt-get update && apt-get install -y --no-install-recommends \
cmake \
libglib2.0-dev \
libtbb-dev \
patchelf \
git \
make \
Expand Down Expand Up @@ -104,11 +103,10 @@ def dockerfile_for_linux(output_file):
WORKDIR /opt/openvino
RUN cp -r /workspace/openvino/licensing LICENSE.openvino
RUN mkdir -p include && \
cp -r /workspace/install/runtime/include/ngraph include/. && \
cp -r /workspace/install/runtime/include/openvino include/.
cp -r /workspace/install/runtime/include/* include/.
RUN mkdir -p lib && \
cp -P /usr/lib/x86_64-linux-gnu/libtbb.so* lib/. && \
cp -P /workspace/install/runtime/lib/intel64/libopenvino*.so* lib/. \
cp -P /workspace/install/runtime/lib/intel64/*.so* lib/. && \
cp -P /workspace/install/runtime/3rdparty/tbb/lib/libtbb.so* lib/. \
"""

df += """
Expand All @@ -128,26 +126,27 @@ def dockerfile_for_windows(output_file):
SHELL ["cmd", "/S", "/C"]

# Install instructions:
# https://docs.openvino.ai/2023.3/openvino_docs_install_guides_installing_openvino_from_archive_windows.html
# https://docs.openvino.ai/2024/get-started/install-openvino/install-openvino-archive-windows.html

# The windows part is using pre-build archive, while the linux part is building
# from source.
# TODO: Unify build steps between windows and linux.

ARG OPENVINO_VERSION
ARG OPENVINO_VERSION=2024.0.0
ARG OPENVINO_BUILD_TYPE

WORKDIR /workspace
RUN curl -L https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/windows/w_openvino_toolkit_windows_2023.3.0.13775.ceeafaf64f3_x86_64.zip --output ov.zip
RUN IF "%OPENVINO_VERSION%"=="2023.3.0" curl -L https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/windows/w_openvino_toolkit_windows_2023.3.0.13775.ceeafaf64f3_x86_64.zip --output ov.zip
RUN IF "%OPENVINO_VERSION%"=="2024.0.0" curl -L https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.0/windows/w_openvino_toolkit_windows_2024.0.0.14509.34caeefd078_x86_64.zip --output ov.zip
RUN IF "%OPENVINO_VERSION%"=="2024.1.0" curl -L https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/windows/w_openvino_toolkit_windows_2024.1.0.15008.f4afc983258_x86_64.zip --output ov.zip
RUN IF not exist ov.zip ( echo "OpenVINO version %OPENVINO_VERSION% not supported" && exit 1 )
RUN tar -xf ov.zip
RUN ren w_openvino_toolkit_windows_2023.3.0.13775.ceeafaf64f3_x86_64 install
RUN powershell.exe "Get-ChildItem w_openvino_toolkit_windows_* | foreach { ren $_.fullname install }"

WORKDIR /opt/openvino
RUN xcopy /I /E \\workspace\\install\\docs\\licensing LICENSE.openvino
RUN mkdir include
RUN xcopy /I /E \\workspace\\install\\runtime\\include\\ie include
RUN xcopy /I /E \\workspace\\install\\runtime\\include\\ngraph include\\ngraph
RUN xcopy /I /E \\workspace\\install\\runtime\\include\\openvino include\\openvino
RUN xcopy /I /E \\workspace\\install\\runtime\\include\\* include
RUN xcopy /I /E \\workspace\\install\\runtime\\bin\\intel64\\%OPENVINO_BUILD_TYPE% bin
RUN xcopy /I /E \\workspace\\install\\runtime\\lib\\intel64\\%OPENVINO_BUILD_TYPE% lib
RUN copy \\workspace\\install\\runtime\\3rdparty\\tbb\\bin\\tbb12.dll bin\\tbb12.dll
Expand Down
Loading