git.iko.soy/typeable/nixpkgs
on master help sign in
scalapack: 2.0.2 -> 2.1
commit8419bb2a20ba7d5b9a556a765bd686170809ab2d authorMarkus Kowalewski <markus.kowalewski@gmail.com> dateWed 20 Nov 2019, 22:44 (7 years ago) parent196880d
2 files changed+7−151
pkgs/development/libraries/science/math/scalapack/default.nix+7−8 pkgs/development/libraries/science/math/scalapack/openmpi4.patch−143
pkgs/development/libraries/science/math/scalapack/default.nix+7−8
@@ -1,20 +1,19 @@
1−{ stdenv, fetchurl, cmake, openssh
1+{ stdenv, fetchFromGitHub, cmake, openssh
22, gfortran, mpi, openblasCompat
33} :
44
55
66stdenv.mkDerivation rec {
77 pname = "scalapack";
8− version = "2.0.2";
8+ version = "2.1";
99
10− src = fetchurl {
11− url = "http://www.netlib.org/scalapack/scalapack-${version}.tgz";
12− sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
10+ src = fetchFromGitHub {
11+ owner = "Reference-ScaLAPACK";
12+ repo = pname;
13+ rev = "v${version}";
14+ sha256 = "042q9kc383h7y0had9a37702z4s0szavss063ljvfdsbjy07gzb1";
1315 };
1416
15− # patch to rename outdated MPI functions
16− patches = [ ./openmpi4.patch ];
17−
1817 nativeBuildInputs = [ cmake openssh ];
1918 buildInputs = [ mpi gfortran openblasCompat ];
2019
pkgs/development/libraries/science/math/scalapack/openmpi4.patchdeleted−143
@@ -1,143 +0,0 @@
1−diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c
2−index e979767..d4b04cf 100644
3−--- a/BLACS/SRC/blacs_get_.c
4−+++ b/BLACS/SRC/blacs_get_.c
5−@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val)
6− case SGET_MSGIDS:
7− if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]);
8− iptr = &val[1];
9−- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val);
10−+ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val);
11− val[0] = 0;
12− val[1] = *iptr;
13− break;
14−diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c
15−index 2db6ccb..6958f32 100644
16−--- a/BLACS/SRC/cgamn2d_.c
17−+++ b/BLACS/SRC/cgamn2d_.c
18−@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
19− {
20− #endif
21− i = 2;
22−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
23−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
24− ierr=MPI_Type_commit(&MyType);
25− bp->N = bp2->N = 1;
26− bp->dtype = bp2->dtype = MyType;
27−diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c
28−index 707c0b6..f802d01 100644
29−--- a/BLACS/SRC/cgamx2d_.c
30−+++ b/BLACS/SRC/cgamx2d_.c
31−@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
32− {
33− #endif
34− i = 2;
35−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
36−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
37− ierr=MPI_Type_commit(&MyType);
38− bp->N = bp2->N = 1;
39− bp->dtype = bp2->dtype = MyType;
40−diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c
41−index dff23b4..a2627ac 100644
42−--- a/BLACS/SRC/dgamn2d_.c
43−+++ b/BLACS/SRC/dgamn2d_.c
44−@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
45− {
46− #endif
47− i = 2;
48−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
49−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
50− ierr=MPI_Type_commit(&MyType);
51− bp->N = bp2->N = 1;
52− bp->dtype = bp2->dtype = MyType;
53−diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c
54−index a51f731..2a644d0 100644
55−--- a/BLACS/SRC/dgamx2d_.c
56−+++ b/BLACS/SRC/dgamx2d_.c
57−@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
58− {
59− #endif
60− i = 2;
61−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
62−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
63− ierr=MPI_Type_commit(&MyType);
64− bp->N = bp2->N = 1;
65− bp->dtype = bp2->dtype = MyType;
66−diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c
67−index 16bc003..f6a7859 100644
68−--- a/BLACS/SRC/igamn2d_.c
69−+++ b/BLACS/SRC/igamn2d_.c
70−@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
71− {
72− #endif
73− i = 2;
74−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
75−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
76− ierr=MPI_Type_commit(&MyType);
77− bp->N = bp2->N = 1;
78− bp->dtype = bp2->dtype = MyType;
79−diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c
80−index 8165cbe..a7cfcc6 100644
81−--- a/BLACS/SRC/igamx2d_.c
82−+++ b/BLACS/SRC/igamx2d_.c
83−@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
84− {
85− #endif
86− i = 2;
87−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
88−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
89− ierr=MPI_Type_commit(&MyType);
90− bp->N = bp2->N = 1;
91− bp->dtype = bp2->dtype = MyType;
92−diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c
93−index d6c95e5..569c797 100644
94−--- a/BLACS/SRC/sgamn2d_.c
95−+++ b/BLACS/SRC/sgamn2d_.c
96−@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
97− {
98− #endif
99− i = 2;
100−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
101−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
102− ierr=MPI_Type_commit(&MyType);
103− bp->N = bp2->N = 1;
104− bp->dtype = bp2->dtype = MyType;
105−diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c
106−index 4b0af6f..8897ece 100644
107−--- a/BLACS/SRC/sgamx2d_.c
108−+++ b/BLACS/SRC/sgamx2d_.c
109−@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
110− {
111− #endif
112− i = 2;
113−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
114−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
115− ierr=MPI_Type_commit(&MyType);
116− bp->N = bp2->N = 1;
117− bp->dtype = bp2->dtype = MyType;
118−diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c
119−index 9de2b23..37897df 100644
120−--- a/BLACS/SRC/zgamn2d_.c
121−+++ b/BLACS/SRC/zgamn2d_.c
122−@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
123− {
124− #endif
125− i = 2;
126−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
127−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
128− ierr=MPI_Type_commit(&MyType);
129− bp->N = bp2->N = 1;
130− bp->dtype = bp2->dtype = MyType;
131−diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c
132−index 414c381..0e9d474 100644
133−--- a/BLACS/SRC/zgamx2d_.c
134−+++ b/BLACS/SRC/zgamx2d_.c
135−@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n,
136− {
137− #endif
138− i = 2;
139−- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType);
140−+ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType);
141− ierr=MPI_Type_commit(&MyType);
142− bp->N = bp2->N = 1;
143− bp->dtype = bp2->dtype = MyType;