From 4411b29065635a2058d713b70b43076eedaab24f Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Wed, 26 Dec 2018 18:26:26 +0000 Subject: [PATCH 1/2] opt-einsum: init at 2.3.2 --- .../python-modules/opt-einsum/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/opt-einsum/default.nix diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix new file mode 100644 index 000000000000..c28105d4e492 --- /dev/null +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, fetchPypi, lib, numpy, pytest, pytestpep8, pytestcov }: +buildPythonPackage rec { + version = "2.3.2"; + pname = "opt_einsum"; + + src = fetchPypi { + inherit version pname; + sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k"; + }; + + checkInputs = [ + pytest + pytestpep8 + pytestcov + ]; + + checkPhase = '' + pytest + ''; + + propagatedBuildInputs = [ + numpy + ]; + + meta = { + description = "Optimizing NumPy's einsum function with order optimization and GPU support."; + homepage = http://optimized-einsum.readthedocs.io; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a377046c990b..ca094e657d5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2416,6 +2416,8 @@ in { cudaSupport = pkgs.config.cudaSupport or false; }; + opt-einsum = callPackage ../development/python-modules/opt-einsum {}; + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; From da01f2a7451072b31daea827bbc1d401c703b70b Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 23 Dec 2018 19:20:39 +0000 Subject: [PATCH 2/2] pyro-ppl: init at 0.3.0 --- .../python-modules/pyro-ppl/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pyro-ppl/default.nix diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix new file mode 100644 index 000000000000..f3bc353fe0e7 --- /dev/null +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 +, graphviz, networkx, six, opt-einsum, tqdm }: +buildPythonPackage rec { + version = "0.3.0"; + pname = "pyro-ppl"; + + src = fetchPypi { + inherit version pname; + sha256 = "0shsnc5bia9k1fzmqnwwbm1x5qvac3zrq4lvyhg27rjgpcamvb9l"; + }; + + propagatedBuildInputs = [ + pytorch + contextlib2 + # TODO(tom): graphviz pulls in a lot of dependencies - make + # optional when some time to figure out how. + graphviz + networkx + six + opt-einsum + tqdm + ]; + + # pyro not shipping tests do simple smoke test instead + checkPhase = '' + python -c "import pyro" + python -c "import pyro.distributions" + python -c "import pyro.infer" + python -c "import pyro.optim" + ''; + + meta = { + description = "A Python library for probabilistic modeling and inference"; + homepage = http://pyro.ai; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca094e657d5b..37a5cc44ebb5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2416,6 +2416,8 @@ in { cudaSupport = pkgs.config.cudaSupport or false; }; + pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; + opt-einsum = callPackage ../development/python-modules/opt-einsum {}; pytorchWithCuda = self.pytorch.override {