diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-03-26 21:55:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-26 21:55:35 +0100 |
commit | 74518d2bf610de186cc000d1d479cb975e5a9ffc (patch) | |
tree | 32b5eb2731232dc8922f636f0c9612c7516248d9 /pkgs/development | |
parent | ab14a429cb1a6cc7b7b843a8ad2661ad1570e57c (diff) | |
parent | 4b8720f332de98d17b9ceedccbf337b4bce15a1d (diff) |
Merge pull request #294315 from mweinelt/openvino-2024.0.0
openvino: 2023.3.0 -> 2024.0.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/openvino/default.nix | 50 | ||||
-rw-r--r-- | pkgs/development/python-modules/openvino/default.nix | 1 |
2 files changed, 16 insertions, 35 deletions
diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 186e1048823aa..a4ce0fe60c1e7 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -1,7 +1,6 @@ { lib , gcc12Stdenv , fetchFromGitHub -, fetchpatch2 , fetchurl , cudaSupport ? opencv.cudaSupport or false @@ -11,10 +10,10 @@ , cmake , git , libarchive +, patchelf , pkg-config -, python +, python3Packages , shellcheck -, sphinx # runtime , flatbuffers @@ -36,40 +35,34 @@ let stdenv = gcc12Stdenv; - # See GNA_VERSION in cmake/dependencies.cmake - gna_version = "03.05.00.2116"; - gna = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; - hash = "sha256-lgNQVncCvaFydqxMBg11JPt8587XhQBL2GHIH/K/4sU="; - }; - tbbbind_version = "2_5"; tbbbind = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz"; hash = "sha256-Tr8wJGUweV8Gb7lhbmcHxrF756ZdKdNRi1eKdp3VTuo="; }; + + python = python3Packages.python.withPackages (ps: with ps; [ + cython + pybind11 + setuptools + sphinx + wheel + ]); + in stdenv.mkDerivation rec { pname = "openvino"; - version = "2023.3.0"; + version = "2024.0.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-dXlQhar5gz+1iLmDYXUY0jZKh4rJ+khRpoZQphJXfcU="; + hash = "sha256-Xsrmc1EynkjgPgiQ+ESyVJRJT9Afqyob0/uH+Is4TYA="; }; - patches = [ - (fetchpatch2 { - name = "enable-js-toggle.patch"; - url = "https://github.com/openvinotoolkit/openvino/commit/0a8f1383826d949c497fe3d05fef9ad2b662fa7e.patch"; - hash = "sha256-mQYunouPo3tRlD5Yp4EUth324ccNnVX8zmjPHvJBYKw="; - }) - ]; - outputs = [ "out" "python" @@ -81,26 +74,15 @@ stdenv.mkDerivation rec { cmake git libarchive + patchelf pkg-config - (python.withPackages (ps: with ps; [ - cython - pybind11 - setuptools - ])) + python shellcheck - sphinx ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; postPatch = '' - mkdir -p temp/gna_${gna_version} - pushd temp/ - bsdtar -xf ${gna} - autoPatchelf gna_${gna_version} - echo "${gna.url}" > gna_${gna_version}/ie_dependency.info - popd - mkdir -p temp/tbbbind_${tbbbind_version} pushd temp/tbbbind_${tbbbind_version} bsdtar -xf ${tbbbind} @@ -116,6 +98,7 @@ stdenv.mkDerivation rec { "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/" "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DPython_EXECUTABLE=${python.interpreter}" (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) (cmakeBool "NCC_SYLE" false) @@ -126,7 +109,6 @@ stdenv.mkDerivation rec { # features (cmakeBool "ENABLE_INTEL_CPU" true) - (cmakeBool "ENABLE_INTEL_GNA" true) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) diff --git a/pkgs/development/python-modules/openvino/default.nix b/pkgs/development/python-modules/openvino/default.nix index 20f47eb666ef8..660e6c41c014a 100644 --- a/pkgs/development/python-modules/openvino/default.nix +++ b/pkgs/development/python-modules/openvino/default.nix @@ -26,7 +26,6 @@ buildPythonPackage { ''; pythonImportsCheck = [ - "ngraph" "openvino" "openvino.runtime" ]; |