From ab687c5a30919c544a1e760c1bd56d0b658a0804 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Jun 2023 23:40:59 +0200 Subject: openvino: 2022.3.0 -> 2023.0.0 https://github.com/openvinotoolkit/openvino/releases/tag/2023.0.0 The build on aarch64-linux requires scons, but I couldn't get that to work, so marking it broken instead. --- pkgs/development/libraries/openvino/default.nix | 35 ++++++------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 68e3de52276..b3809f09536 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , fetchurl , substituteAll @@ -25,41 +24,30 @@ }: let - # See FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake - myriad_firmware_version = "20221129_35"; - myriad_usb_firmware = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_${myriad_firmware_version}.zip"; - hash = "sha256-HKNWbSlMjSafOgrS9WmenbsmeaJKRVssw0NhIwPYZ70="; - }; - myriad_pcie_firmware = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_${myriad_firmware_version}.zip"; - hash = "sha256-VmfrAoKQ++ySIgAxWQul+Hd0p7Y4sTF44Nz4RHpO6Mo="; - }; - # See GNA_VERSION in cmake/dependencies.cmake - gna_version = "03.00.00.1910"; + gna_version = "03.05.00.1906"; gna = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; - hash = "sha256-iU3bwK40WfBFE7hTsMq8MokN1Oo3IooCK2oyEBvbt/g="; + hash = "sha256-SlvobZwCaw4Qr6wqV/x8mddisw49UGq7OjOA+8/icm4="; }; tbbbind_version = "2_5"; tbbbind = fetchurl { - url = "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v2.tgz"; - hash = "sha256-hl54lMWEAiM8rw0bKIBW4OarK/fJ0AydxgVhxIS8kPQ="; + url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v3.tgz"; + hash = "sha256-053rJiwGmBteLS48WT6fyb5izk/rkd1OZI6SdTZZprM="; }; in stdenv.mkDerivation rec { pname = "openvino"; - version = "2022.3.0"; + version = "2023.0.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-Ie58zTNatiYZZQJ8kJh/+HlSetQjhAtf2Us83z1jGv4="; + hash = "sha256-z88SgAZ0UX9X7BhBA7/NU/UhVLltb6ANKolruU8YiZQ="; }; outputs = [ @@ -90,14 +78,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - mkdir -p temp/vpu/firmware/{pcie,usb}-ma2x8x - pushd temp/vpu/firmware - bsdtar -xf ${myriad_pcie_firmware} -C pcie-ma2x8x - echo "${myriad_pcie_firmware.url}" > pcie-ma2x8x/ie_dependency.info - bsdtar -xf ${myriad_usb_firmware} -C usb-ma2x8x - echo "${myriad_usb_firmware.url}" > usb-ma2x8x/ie_dependency.info - popd - mkdir -p temp/gna_${gna_version} pushd temp/ bsdtar -xf ${gna} @@ -184,7 +164,8 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Cannot find macos sdk + broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory. + || stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } -- cgit 1.4.1