uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
47
pkgs/applications/science/math/caffe/darwin.patch
Normal file
47
pkgs/applications/science/math/caffe/darwin.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index c823f66e..65b90c5e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -32,9 +32,9 @@ SRC_DIRS := $(shell find * -type d -exec bash -c "find {} -maxdepth 1 \
|
||||
LIBRARY_NAME := $(PROJECT)
|
||||
LIB_BUILD_DIR := $(BUILD_DIR)/lib
|
||||
STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a
|
||||
-DYNAMIC_VERSION_MAJOR := 1
|
||||
-DYNAMIC_VERSION_MINOR := 0
|
||||
-DYNAMIC_VERSION_REVISION := 0
|
||||
+DYNAMIC_VERSION_MAJOR := 1
|
||||
+DYNAMIC_VERSION_MINOR := 0
|
||||
+DYNAMIC_VERSION_REVISION := 0
|
||||
DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so
|
||||
#DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR)
|
||||
DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION)
|
||||
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
|
||||
index c48255c8..cf4c580e 100644
|
||||
--- a/cmake/Dependencies.cmake
|
||||
+++ b/cmake/Dependencies.cmake
|
||||
@@ -105,7 +105,6 @@ if(USE_OPENCV)
|
||||
endif()
|
||||
|
||||
# ---[ BLAS
|
||||
-if(NOT APPLE)
|
||||
set(BLAS "Atlas" CACHE STRING "Selected BLAS library")
|
||||
set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL")
|
||||
|
||||
@@ -123,17 +122,6 @@ if(NOT APPLE)
|
||||
list(APPEND Caffe_LINKER_LIBS PUBLIC ${MKL_LIBRARIES})
|
||||
list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_MKL)
|
||||
endif()
|
||||
-elseif(APPLE)
|
||||
- find_package(vecLib REQUIRED)
|
||||
- list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${vecLib_INCLUDE_DIR})
|
||||
- list(APPEND Caffe_LINKER_LIBS PUBLIC ${vecLib_LINKER_LIBS})
|
||||
-
|
||||
- if(VECLIB_FOUND)
|
||||
- if(NOT vecLib_INCLUDE_DIR MATCHES "^/System/Library/Frameworks/vecLib.framework.*")
|
||||
- list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_ACCELERATE)
|
||||
- endif()
|
||||
- endif()
|
||||
-endif()
|
||||
|
||||
# ---[ Python
|
||||
if(BUILD_python)
|
||||
149
pkgs/applications/science/math/caffe/default.nix
Normal file
149
pkgs/applications/science/math/caffe/default.nix
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
{ config, stdenv, lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, cmake
|
||||
, boost
|
||||
, gflags
|
||||
, glog
|
||||
, hdf5-cpp
|
||||
, opencv3
|
||||
, protobuf
|
||||
, doxygen
|
||||
, blas
|
||||
, Accelerate, CoreGraphics, CoreVideo
|
||||
, lmdbSupport ? true, lmdb
|
||||
, leveldbSupport ? true, leveldb, snappy
|
||||
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
|
||||
, cudnnSupport ? cudaSupport
|
||||
, ncclSupport ? false
|
||||
, pythonSupport ? false, python ? null, numpy ? null
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (cudaPackages) cudatoolkit cudnn nccl;
|
||||
in
|
||||
|
||||
assert leveldbSupport -> (leveldb != null && snappy != null);
|
||||
assert cudnnSupport -> cudaSupport;
|
||||
assert ncclSupport -> cudaSupport;
|
||||
assert pythonSupport -> (python != null && numpy != null);
|
||||
|
||||
let
|
||||
toggle = bool: if bool then "ON" else "OFF";
|
||||
|
||||
test_model_weights = fetchurl {
|
||||
url = "http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel";
|
||||
sha256 = "472d4a06035497b180636d8a82667129960371375bd10fcb6df5c6c7631f25e0";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "caffe";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BVLC";
|
||||
repo = "caffe";
|
||||
rev = version;
|
||||
sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
cmakeFlags =
|
||||
# It's important that caffe is passed the major and minor version only because that's what
|
||||
# boost_python expects
|
||||
[ (if pythonSupport then "-Dpython_version=${python.pythonVersion}" else "-DBUILD_python=OFF")
|
||||
"-DBLAS=open"
|
||||
] ++ (if cudaSupport then [
|
||||
"-DCUDA_ARCH_NAME=All"
|
||||
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
|
||||
] else [ "-DCPU_ONLY=ON" ])
|
||||
++ ["-DUSE_NCCL=${toggle ncclSupport}"]
|
||||
++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]
|
||||
++ ["-DUSE_LMDB=${toggle lmdbSupport}"];
|
||||
|
||||
buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ]
|
||||
++ lib.optional cudaSupport cudatoolkit
|
||||
++ lib.optional cudnnSupport cudnn
|
||||
++ lib.optional lmdbSupport lmdb
|
||||
++ lib.optional ncclSupport nccl
|
||||
++ lib.optionals leveldbSupport [ leveldb snappy ]
|
||||
++ lib.optionals pythonSupport [ python numpy ]
|
||||
++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]
|
||||
;
|
||||
|
||||
propagatedBuildInputs = lib.optionals pythonSupport (
|
||||
# requirements.txt
|
||||
let pp = python.pkgs; in ([
|
||||
pp.numpy pp.scipy pp.scikitimage pp.h5py
|
||||
pp.matplotlib pp.ipython pp.networkx pp.nose
|
||||
pp.pandas pp.python-dateutil pp.protobuf pp.gflags
|
||||
pp.pyyaml pp.pillow pp.six
|
||||
] ++ lib.optional leveldbSupport pp.leveldb)
|
||||
);
|
||||
|
||||
outputs = [ "bin" "out" ];
|
||||
propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle
|
||||
|
||||
patches = [
|
||||
./darwin.patch
|
||||
] ++ lib.optional pythonSupport (substituteAll {
|
||||
src = ./python.patch;
|
||||
inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
|
||||
});
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/caffe/util/io.cpp --replace \
|
||||
'SetTotalBytesLimit(kProtoReadBytesLimit, 536870912)' \
|
||||
'SetTotalBytesLimit(kProtoReadBytesLimit)'
|
||||
'' + lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
|
||||
# CUDA 9.0 doesn't support sm_20
|
||||
sed -i 's,20 21(20) ,,' cmake/Cuda.cmake
|
||||
'';
|
||||
|
||||
preConfigure = lib.optionalString pythonSupport ''
|
||||
# We need this when building with Python bindings
|
||||
export BOOST_LIBRARYDIR="${boost.out}/lib";
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Internal static library.
|
||||
rm $out/lib/libproto.a
|
||||
|
||||
# Install models
|
||||
cp -a ../models $out/share/Caffe/models
|
||||
|
||||
moveToOutput "bin" "$bin"
|
||||
'' + lib.optionalString pythonSupport ''
|
||||
mkdir -p $out/${python.sitePackages}
|
||||
mv $out/python/caffe $out/${python.sitePackages}
|
||||
rm -rf $out/python
|
||||
'';
|
||||
|
||||
doInstallCheck = false; # build takes more than 30 min otherwise
|
||||
installCheckPhase = ''
|
||||
model=bvlc_reference_caffenet
|
||||
m_path="$out/share/Caffe/models/$model"
|
||||
$bin/bin/caffe test \
|
||||
-model "$m_path/deploy.prototxt" \
|
||||
-solver "$m_path/solver.prototxt" \
|
||||
-weights "${test_model_weights}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deep learning framework";
|
||||
longDescription = ''
|
||||
Caffe is a deep learning framework made with expression, speed, and
|
||||
modularity in mind. It is developed by the Berkeley Vision and Learning
|
||||
Center (BVLC) and by community contributors.
|
||||
'';
|
||||
homepage = "http://caffe.berkeleyvision.org/";
|
||||
maintainers = with maintainers; [ ];
|
||||
broken = pythonSupport && (python.isPy310);
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
70
pkgs/applications/science/math/caffe/python.patch
Normal file
70
pkgs/applications/science/math/caffe/python.patch
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
commit b14ca23651d390fcae4a929dedc7c33a83453a66
|
||||
Author: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Sun Feb 17 08:41:27 2019 +0100
|
||||
|
||||
Find boost_pythonXX
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 08f56a33..0a04592a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -99,10 +99,10 @@ add_subdirectory(docs)
|
||||
add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/lint.cmake)
|
||||
|
||||
# ---[ pytest target
|
||||
-if(BUILD_python)
|
||||
- add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
|
||||
- add_dependencies(pytest pycaffe)
|
||||
-endif()
|
||||
+# if(BUILD_python)
|
||||
+# add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
|
||||
+# add_dependencies(pytest pycaffe)
|
||||
+# endif()
|
||||
|
||||
# ---[ uninstall target
|
||||
configure_file(
|
||||
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
|
||||
index 4a5bac47..be026d43 100644
|
||||
--- a/cmake/Dependencies.cmake
|
||||
+++ b/cmake/Dependencies.cmake
|
||||
@@ -141,37 +141,14 @@ if(BUILD_python)
|
||||
# use python3
|
||||
find_package(PythonInterp 3.0)
|
||||
find_package(PythonLibs 3.0)
|
||||
- find_package(NumPy 1.7.1)
|
||||
- # Find the matching boost python implementation
|
||||
- set(version ${PYTHONLIBS_VERSION_STRING})
|
||||
-
|
||||
- STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
|
||||
- find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
|
||||
- set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
|
||||
-
|
||||
- while(NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
|
||||
- STRING( REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version} )
|
||||
-
|
||||
- STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
|
||||
- find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
|
||||
- set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
|
||||
-
|
||||
- STRING( REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version ${version} )
|
||||
- if("${has_more_version}" STREQUAL "")
|
||||
- break()
|
||||
- endif()
|
||||
- endwhile()
|
||||
- if(NOT Boost_PYTHON_FOUND)
|
||||
- find_package(Boost 1.46 COMPONENTS python)
|
||||
- endif()
|
||||
else()
|
||||
# disable Python 3 search
|
||||
find_package(PythonInterp 2.7)
|
||||
find_package(PythonLibs 2.7)
|
||||
- find_package(NumPy 1.7.1)
|
||||
- find_package(Boost 1.46 COMPONENTS python)
|
||||
endif()
|
||||
- if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND)
|
||||
+ find_package(NumPy 1.7.1)
|
||||
+ find_package(Boost 1.46 REQUIRED COMPONENTS python@major@@minor@)
|
||||
+ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON@major@@minor@_FOUND)
|
||||
set(HAVE_PYTHON TRUE)
|
||||
if(BUILD_python_layer)
|
||||
list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER)
|
||||
Loading…
Add table
Add a link
Reference in a new issue