diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-06-02 12:52:10 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-06-02 19:40:49 +0300 |
| commit | 1260b05279b96b7241ee6f0aa2f7c1e62e457a26 (patch) | |
| tree | e66fe2f2edd6ccadae8b1dded4a440341367bfcf /pkgs/applications/science/math | |
| parent | 19973538842313ce14b91de13f09f578f2e84106 (diff) | |
| download | nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.tar nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.tar.gz nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.tar.bz2 nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.tar.lz nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.tar.xz nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.tar.zst nixlib-1260b05279b96b7241ee6f0aa2f7c1e62e457a26.zip | |
cntk: 2.4 -> 2.7
Restrict platforms to x86_64-linux.
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/cntk/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/science/math/cntk/fix_std_bind.patch | 11 |
2 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 4bf922c4e169..465c7318c0e3 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -18,17 +18,15 @@ let in stdenv.mkDerivation rec { name = "CNTK-${version}"; - version = "2.4"; + version = "2.7"; # Submodules src = fetchgit { url = "https://github.com/Microsoft/CNTK"; rev = "v${version}"; - sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y"; + sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; }; - patches = [ ./fix_std_bind.patch ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] @@ -87,6 +85,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch deleted file mode 100644 index df97a0c66669..000000000000 --- a/pkgs/applications/science/math/cntk/fix_std_bind.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h ---- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300 -+++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300 -@@ -9,6 +9,7 @@ - #include <boost/noncopyable.hpp> - #include <memory> - #include <vector> -+#include <functional> - - #include "CNTKLibrary.h" - #include "CNTKLibraryC.h" |