commit aa5693fc1933a4452ba04efd68373996aca43483 · pyrox.dev/nixpkgs

+6 -11

pkgs/by-name/on/onnxruntime/package.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         lib,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       -
         fetchpatch,

     

       7
       6
        
         abseil-cpp_202407,

     

       8
       7
        
         cmake,

     

       9
       8
        
         cpuinfo,

     
···

       20
       19
        
         re2,

     

       21
       20
        
         zlib,

     

       22
       21
        
         microsoft-gsl,

     

       23
       23
       -
         libiconv,

     

       24
       24
       -
         protobuf_21,

     

       22
       22
       +
         protobuf,

     

       25
       23
        
         pythonSupport ? true,

     

       26
       24
        
         cudaSupport ? config.cudaSupport,

     

       27
       25
        
         ncclSupport ? config.cudaSupport,

     
···

       29
       27
        
       }@inputs:

     

       30
       28
        
       

     

       31
       29
        
       let

     

       32
       32
       -
         version = "1.22.0";

     

       30
       30
       +
         version = "1.22.2";

     

       33
       31
        
       

     

       34
       32
        
         src = fetchFromGitHub {

     

       35
       33
        
           owner = "microsoft";

     

       36
       34
        
           repo = "onnxruntime";

     

       37
       35
        
           tag = "v${version}";

     

       38
       36
        
           fetchSubmodules = true;

     

       39
       39
       -
           hash = "sha256-fcTvMsEgO3tHOvCKCAqkO/bpZX4tcJHq9ZqpZH+uMqs=";

     

       37
       37
       +
           hash = "sha256-X8Pdtc0eR0iU+Xi2A1HrNo1xqCnoaxNjj4QFm/E3kSE=";

     

       40
       38
        
         };

     

       41
       39
        
       

     

       42
       40
        
         stdenv = throw "Use effectiveStdenv instead";

     
···

       114
       112
        
           cmake

     

       115
       113
        
           pkg-config

     

       116
       114
        
           python3Packages.python

     

       117
       117
       -
           protobuf_21

     

       115
       115
       +
           protobuf

     

       118
       116
        
         ]

     

       119
       117
        
         ++ lib.optionals pythonSupport (

     

       120
       118
        
           with python3Packages;

     
···

       155
       153
        
             packaging

     

       156
       154
        
           ]

     

       157
       155
        
         )

     

       158
       158
       -
         ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [

     

       159
       159
       -
           libiconv

     

       160
       160
       -
         ]

     

       161
       156
        
         ++ lib.optionals cudaSupport (

     

       162
       157
        
           with cudaPackages;

     

       163
       158
        
           [

     
···

       214
       209
        
           (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint}")

     

       215
       210
        
           (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")

     

       216
       211
        
           # fails to find protoc on darwin, so specify it

     

       217
       217
       -
           (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" "${protobuf_21}/bin/protoc")

     

       212
       212
       +
           (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf))

     

       218
       213
        
           (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)

     

       219
       214
        
           (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck)

     

       220
       215
        
           (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false)

     
···

       283
       278
        
       

     

       284
       279
        
         passthru = {

     

       285
       280
        
           inherit cudaSupport cudaPackages; # for the python module

     

       286
       286
       -
           protobuf = protobuf_21;

     

       281
       281
       +
           inherit protobuf;

     

       287
       282
        
           tests = lib.optionalAttrs pythonSupport {

     

       288
       283
        
             python = python3Packages.onnxruntime;

     

       289
       284
        
           };

+8 -5

pkgs/development/python-modules/onnxruntime/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         buildPythonPackage,

     

       5
       5
       +
         onnxruntime,

     

       5
       6
        
         autoPatchelfHook,

     

       6
       6
       -
         onnxruntime,

     

       7
       7
       +
       

     

       8
       8
       +
         # buildInputs

     

       9
       9
       +
         oneDNN,

     

       10
       10
       +
         re2,

     

       11
       11
       +
       

     

       12
       12
       +
         # dependencies

     

       7
       13
        
         coloredlogs,

     

       8
       14
        
         numpy,

     

       9
       15
        
         packaging,

     

       10
       10
       -
         oneDNN,

     

       11
       11
       -
         re2,

     

       12
       12
       -
       

     

       13
       16
        
       }:

     

       14
       17
        
       

     

       15
       18
        
       # onnxruntime requires an older protobuf.

     
···

       69
       72
        
           ]

     

       70
       73
        
         );

     

       71
       74
        
       

     

       72
       72
       -
         propagatedBuildInputs = [

     

       75
       75
       +
         dependencies = [

     

       73
       76
        
           coloredlogs

     

       74
       77
        
           # flatbuffers

     

       75
       78
        
           numpy