diff options
| author | Chris Ostrouchov <chris.ostrouchov@gmail.com> | 2018-10-15 13:11:39 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 07:46:55 +0200 |
| commit | 24dc5c67810a96ab3fa2f768789d5352a183b34b (patch) | |
| tree | ab3f12c5fc8cb15725367c975812c972d8250f65 | |
| parent | ac2ec2ecc1a821f4fc0030af4351aa30ee03d518 (diff) | |
| download | nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.tar nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.tar.gz nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.tar.bz2 nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.tar.lz nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.tar.xz nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.tar.zst nixlib-24dc5c67810a96ab3fa2f768789d5352a183b34b.zip | |
pythonPackages.cntk: refactor move to python-modules
| -rw-r--r-- | pkgs/development/python-modules/cntk/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 28 |
2 files changed, 39 insertions, 27 deletions
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix new file mode 100644 index 000000000000..2bcb7165ca1c --- /dev/null +++ b/pkgs/development/python-modules/cntk/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, pkgs +, numpy +, scipy +, enum34 +, protobuf +, pip +, python +}: + +buildPythonPackage rec { + inherit (pkgs.cntk) name version src meta; + + buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ]; + propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ]; + + CNTK_LIB_PATH = "${pkgs.cntk}/lib"; + CNTK_COMPONENT_VERSION = pkgs.cntk.version; + + postPatch = '' + cd bindings/python + sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/cntk/libs + ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs + # It's not installed for some reason. + cp cntk/cntk_py.py $out/${python.sitePackages}/cntk + ''; + + # Actual tests are broken. + checkPhase = '' + cd $NIX_BUILD_TOP + ${python.interpreter} -c "import cntk" + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57bea81da688..27815318c962 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1274,33 +1274,7 @@ in { CDDB = callPackage ../development/python-modules/cddb { }; - cntk = buildPythonPackage rec { - inherit (pkgs.cntk) name version src meta; - - buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ]; - propagatedBuildInputs = with self; [ numpy scipy enum34 protobuf pip ]; - - CNTK_LIB_PATH = "${pkgs.cntk}/lib"; - CNTK_COMPONENT_VERSION = pkgs.cntk.version; - - postPatch = '' - cd bindings/python - sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py - ''; - - postInstall = '' - rm -rf $out/${python.sitePackages}/cntk/libs - ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs - # It's not installed for some reason. - cp cntk/cntk_py.py $out/${python.sitePackages}/cntk - ''; - - # Actual tests are broken. - checkPhase = '' - cd $NIX_BUILD_TOP - ${python.interpreter} -c "import cntk" - ''; - }; + cntk = callPackage ../development/python-modules/cntk { }; celery = callPackage ../development/python-modules/celery { }; |