git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110688 from Mic92/umap-learn
commitb1c006f05599b41b798e47baa4d9ba6d1a8c07a5 authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 27 Jan 2021, 09:57 (6 years ago) parent6a146b13012c1c
3 files changed+64−2
compare with master
unifiedsplit
pkgs/development/python-modules/pynndescent/default.nix+52 pkgs/development/python-modules/umap-learn/default.nix+10−2 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/pynndescent/default.nixnew file+52
@@ -0,0 +1,52 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, fetchpatch
5+, nose
6+, scikitlearn
7+, scipy
8+, numba
9+, llvmlite
10+, joblib
11+}:
12+
13+buildPythonPackage rec {
14+ pname = "pynndescent";
15+ version = "0.5.1";
16+
17+ src = fetchPypi {
18+ inherit pname version;
19+ sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe";
20+ };
21+
22+ patches = [
23+ # fixes tests, included in 0.5.2
24+ (fetchpatch {
25+ url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch";
26+ sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s=";
27+ })
28+ ];
29+
30+ checkInputs = [
31+ nose
32+ ];
33+
34+ propagatedBuildInputs = [
35+ scikitlearn
36+ scipy
37+ numba
38+ llvmlite
39+ joblib
40+ ];
41+
42+ checkPhase = ''
43+ nosetests
44+ '';
45+
46+ meta = with lib; {
47+ description = "Nearest Neighbor Descent";
48+ homepage = "https://github.com/lmcinnes/pynndescent";
49+ license = licenses.bsd2;
50+ maintainers = [ maintainers.mic92 ];
51+ };
52+}
pkgs/development/python-modules/umap-learn/default.nix+10−2
@@ -6,22 +6,25 @@
66, scikitlearn
77, scipy
88, numba
9+, pynndescent
10+, tensorflow
911, pytestCheckHook
1012}:
1113
1214buildPythonPackage rec {
1315 pname = "umap-learn";
14− version = "0.4.5";
16+ version = "0.5.0";
1517
1618 src = fetchFromGitHub {
1719 owner = "lmcinnes";
1820 repo = "umap";
1921 rev = version;
20− sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq";
22+ sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM=";
2123 };
2224
2325 checkInputs = [
2426 nose
27+ tensorflow
2528 pytestCheckHook
2629 ];
2730
@@ -30,8 +33,13 @@ buildPythonPackage rec {
3033 scikitlearn
3134 scipy
3235 numba
36+ pynndescent
3337 ];
3438
39+ preCheck = ''
40+ export HOME=$TMPDIR
41+ '';
42+
3543 disabledTests = [
3644 # Plot functionality requires additional packages.
3745 # These test also fail with 'RuntimeError: cannot cache function' error.
pkgs/top-level/python-packages.nix+2
@@ -4867,6 +4867,8 @@ in {
48674867
48684868 pkuseg = callPackage ../development/python-modules/pkuseg { };
48694869
4870+ pynndescent = callPackage ../development/python-modules/pynndescent { };
4871+
48704872 pysbd = callPackage ../development/python-modules/pysbd { };
48714873
48724874 python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };