Commit fb1d8dc0 authored by Gaetan Lepage's avatar Gaetan Lepage
Browse files

onnxruntime: remove unnecessary nvcc-gsl.patch

parent bbcd0c54

pkgs/by-name/on/onnxruntime/nvcc-gsl.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake

index ebf20ab21b..2aa5d9e908 100644

--- a/cmake/external/onnxruntime_external_deps.cmake

+++ b/cmake/external/onnxruntime_external_deps.cmake

@@ -403,15 +403,6 @@ if (CPUINFO_SUPPORTED)

 endif()

 

 if(onnxruntime_USE_CUDA)

-  onnxruntime_fetchcontent_declare(

-    GSL

-    URL ${DEP_URL_microsoft_gsl}

-    URL_HASH SHA1=${DEP_SHA1_microsoft_gsl}

-    PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/gsl/1064.patch

-    EXCLUDE_FROM_ALL

-    FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL

-  )

-else()

   onnxruntime_fetchcontent_declare(

     GSL

     URL ${DEP_URL_microsoft_gsl}

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

+0 −5
Original line number Diff line number Diff line
@@ -103,11 +103,6 @@ effectiveStdenv.mkDerivation rec { 
    # https://github.com/microsoft/onnxruntime/pull/15661

    # https://github.com/microsoft/onnxruntime/pull/20509

    ./cpuinfo-logging.patch

  ]

  ++ lib.optionals cudaSupport [

    # We apply the referenced 1064.patch ourselves to our nix dependency.

    #  FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0

    ./nvcc-gsl.patch

  ];



  nativeBuildInputs = [