Unverified Commit 48245956 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

caffe: fix build with cmake 4 (#455066)

parents 21298092 366d6572

pkgs/applications/science/math/caffe/cmake-minimum-required.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 08f56a33..c5291fd7 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -1,4 +1,4 @@

-cmake_minimum_required(VERSION 2.8.7)

+cmake_minimum_required(VERSION 3.10)

 if(POLICY CMP0046)

   cmake_policy(SET CMP0046 NEW)

 endif()

pkgs/applications/science/math/caffe/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -112,9 +112,11 @@ stdenv.mkDerivation rec { 
  propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle



  patches = [

    ./cmake-minimum-required.patch

    ./darwin.patch

    ./glog-cmake.patch

    ./random-shuffle.patch

    ./random-shuffle-includes.patch

    (fetchpatch {

      name = "support-opencv4";

      url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch";

pkgs/applications/science/math/caffe/random-shuffle-includes.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp

index 01213691..f42e7bea 100644

--- a/src/caffe/layers/hdf5_data_layer.cpp

+++ b/src/caffe/layers/hdf5_data_layer.cpp

@@ -6,7 +6,9 @@ TODO:

   :: don't forget to update hdf5_daa_layer.cu accordingly

 - add ability to shuffle filenames if flag is set

 */

+#include <algorithm>

 #include <fstream>  // NOLINT(readability/streams)

+#include <random>

 #include <string>

 #include <vector>