Skip to content

Commit b702e68

Browse files
langoulangou
authored
Merge pull request #140 from hughcars/master
Fix incompatible pointer type
2 parents bd7ccd5 + bd7bfa9 commit b702e68

File tree

21 files changed

+137
-125
lines changed

21 files changed

+137
-125
lines changed

‎BLACS/SRC/dgamn2d_.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ F_VOID_FUNC dgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
201201
bp = BI_GetBuff(i);
202202
bp2 = &BI_AuxBuff;
203203
bp2->Buff = &bp->Buff[length];
204-
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
204+
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
205205
/*
206206
* Fill in distance vector
207207
*/
@@ -254,7 +254,7 @@ F_VOID_FUNC dgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
254254
bp = BI_GetBuff(length*2);
255255
bp2 = &BI_AuxBuff;
256256
bp2->Buff = &bp->Buff[length];
257-
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
257+
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
258258
}
259259
bp->N = bp2->N = N;
260260
bp->dtype = bp2->dtype = MPI_DOUBLE;
@@ -280,7 +280,7 @@ F_VOID_FUNC dgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
280280
ctxt->scp->comm);
281281
if (ctxt->scp->Iam == dest)
282282
{
283-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
283+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp2->Buff);
284284
if (Mpval(ldia) != -1)
285285
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
286286
(BI_DistType *) &bp2->Buff[idist],
@@ -291,7 +291,7 @@ F_VOID_FUNC dgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
291291
{
292292
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, BlacComb,
293293
ctxt->scp->comm);
294-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
294+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp2->Buff);
295295
if (Mpval(ldia) != -1)
296296
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
297297
(BI_DistType *) &bp2->Buff[idist],
@@ -370,6 +370,6 @@ F_VOID_FUNC dgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
370370
/*
371371
* Unpack the amn array
372372
*/
373-
if (bp != &BI_AuxBuff) BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
373+
if (bp != &BI_AuxBuff) BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
374374
}
375375
}

‎BLACS/SRC/dgamx2d_.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ F_VOID_FUNC dgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
201201
bp = BI_GetBuff(i);
202202
bp2 = &BI_AuxBuff;
203203
bp2->Buff = &bp->Buff[length];
204-
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
204+
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
205205
/*
206206
* Fill in distance vector
207207
*/
@@ -254,7 +254,7 @@ F_VOID_FUNC dgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
254254
bp = BI_GetBuff(length*2);
255255
bp2 = &BI_AuxBuff;
256256
bp2->Buff = &bp->Buff[length];
257-
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
257+
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
258258
}
259259
bp->N = bp2->N = N;
260260
bp->dtype = bp2->dtype = MPI_DOUBLE;
@@ -280,7 +280,7 @@ F_VOID_FUNC dgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
280280
ctxt->scp->comm);
281281
if (ctxt->scp->Iam == dest)
282282
{
283-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
283+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp2->Buff);
284284
if (Mpval(ldia) != -1)
285285
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
286286
(BI_DistType *) &bp2->Buff[idist],
@@ -291,7 +291,7 @@ F_VOID_FUNC dgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
291291
{
292292
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, BlacComb,
293293
ctxt->scp->comm);
294-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
294+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp2->Buff);
295295
if (Mpval(ldia) != -1)
296296
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
297297
(BI_DistType *) &bp2->Buff[idist],
@@ -370,6 +370,6 @@ F_VOID_FUNC dgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
370370
/*
371371
* Unpack the amx array
372372
*/
373-
if (bp != &BI_AuxBuff) BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
373+
if (bp != &BI_AuxBuff) BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
374374
}
375375
}

‎BLACS/SRC/dgsum2d_.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ F_VOID_FUNC dgsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
151151
bp = BI_GetBuff(length*2);
152152
bp2 = &BI_AuxBuff;
153153
bp2->Buff = &bp->Buff[length];
154-
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
154+
BI_dmvcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
155155
}
156156
bp->dtype = bp2->dtype = MPI_DOUBLE;
157157
bp->N = bp2->N = N;
@@ -164,13 +164,13 @@ F_VOID_FUNC dgsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
164164
ierr=MPI_Reduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, MPI_SUM,
165165
dest, ctxt->scp->comm);
166166
if (ctxt->scp->Iam == dest)
167-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
167+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp2->Buff);
168168
}
169169
else
170170
{
171171
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, MPI_SUM,
172172
ctxt->scp->comm);
173-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
173+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp2->Buff);
174174
}
175175
if (BI_ActiveQ) BI_UpdateBuffs(NULL);
176176
return;
@@ -224,7 +224,7 @@ F_VOID_FUNC dgsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
224224
if (bp != &BI_AuxBuff)
225225
{
226226
if ( (ctxt->scp->Iam == dest) || (dest == -1) )
227-
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
227+
BI_dvmcopy(Mpval(m), Mpval(n), A, tlda, (double*)bp->Buff);
228228
BI_UpdateBuffs(bp);
229229
}
230230
else

‎BLACS/SRC/igamn2d_.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ F_VOID_FUNC igamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
198198
bp = BI_GetBuff(i);
199199
bp2 = &BI_AuxBuff;
200200
bp2->Buff = &bp->Buff[length];
201-
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
201+
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
202202
/*
203203
* Fill in distance vector
204204
*/
@@ -251,7 +251,7 @@ F_VOID_FUNC igamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
251251
bp = BI_GetBuff(length*2);
252252
bp2 = &BI_AuxBuff;
253253
bp2->Buff = &bp->Buff[length];
254-
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
254+
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
255255
}
256256
bp->N = bp2->N = N;
257257
bp->dtype = bp2->dtype = IntTyp;
@@ -277,7 +277,7 @@ F_VOID_FUNC igamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
277277
ctxt->scp->comm);
278278
if (ctxt->scp->Iam == dest)
279279
{
280-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
280+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp2->Buff);
281281
if (Mpval(ldia) != -1)
282282
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
283283
(BI_DistType *) &bp2->Buff[idist],
@@ -288,7 +288,7 @@ F_VOID_FUNC igamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
288288
{
289289
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, BlacComb,
290290
ctxt->scp->comm);
291-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
291+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp2->Buff);
292292
if (Mpval(ldia) != -1)
293293
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
294294
(BI_DistType *) &bp2->Buff[idist],
@@ -367,6 +367,6 @@ F_VOID_FUNC igamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
367367
/*
368368
* Unpack the amn array
369369
*/
370-
if (bp != &BI_AuxBuff) BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
370+
if (bp != &BI_AuxBuff) BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
371371
}
372372
}

‎BLACS/SRC/igamx2d_.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ F_VOID_FUNC igamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
198198
bp = BI_GetBuff(i);
199199
bp2 = &BI_AuxBuff;
200200
bp2->Buff = &bp->Buff[length];
201-
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
201+
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
202202
/*
203203
* Fill in distance vector
204204
*/
@@ -251,7 +251,7 @@ F_VOID_FUNC igamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
251251
bp = BI_GetBuff(length*2);
252252
bp2 = &BI_AuxBuff;
253253
bp2->Buff = &bp->Buff[length];
254-
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
254+
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
255255
}
256256
bp->N = bp2->N = N;
257257
bp->dtype = bp2->dtype = IntTyp;
@@ -277,7 +277,7 @@ F_VOID_FUNC igamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
277277
ctxt->scp->comm);
278278
if (ctxt->scp->Iam == dest)
279279
{
280-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
280+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp2->Buff);
281281
if (Mpval(ldia) != -1)
282282
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
283283
(BI_DistType *) &bp2->Buff[idist],
@@ -288,7 +288,7 @@ F_VOID_FUNC igamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
288288
{
289289
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, BlacComb,
290290
ctxt->scp->comm);
291-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
291+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp2->Buff);
292292
if (Mpval(ldia) != -1)
293293
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
294294
(BI_DistType *) &bp2->Buff[idist],
@@ -367,6 +367,6 @@ F_VOID_FUNC igamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
367367
/*
368368
* Unpack the amx array
369369
*/
370-
if (bp != &BI_AuxBuff) BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
370+
if (bp != &BI_AuxBuff) BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
371371
}
372372
}

‎BLACS/SRC/igsum2d_.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ F_VOID_FUNC igsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
151151
bp = BI_GetBuff(length*2);
152152
bp2 = &BI_AuxBuff;
153153
bp2->Buff = &bp->Buff[length];
154-
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
154+
BI_imvcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
155155
}
156156

157157
MPI_Type_match_size(MPI_TYPECLASS_INTEGER, sizeof(Int), &Dtype);
@@ -166,13 +166,13 @@ F_VOID_FUNC igsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
166166
ierr=MPI_Reduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, MPI_SUM,
167167
dest, ctxt->scp->comm);
168168
if (ctxt->scp->Iam == dest)
169-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
169+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp2->Buff);
170170
}
171171
else
172172
{
173173
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, MPI_SUM,
174174
ctxt->scp->comm);
175-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
175+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp2->Buff);
176176
}
177177
if (BI_ActiveQ) BI_UpdateBuffs(NULL);
178178
return;
@@ -226,7 +226,7 @@ F_VOID_FUNC igsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
226226
if (bp != &BI_AuxBuff)
227227
{
228228
if ( (ctxt->scp->Iam == dest) || (dest == -1) )
229-
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
229+
BI_ivmcopy(Mpval(m), Mpval(n), A, tlda, (Int*)bp->Buff);
230230
BI_UpdateBuffs(bp);
231231
}
232232
else

‎BLACS/SRC/sgamn2d_.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ F_VOID_FUNC sgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
201201
bp = BI_GetBuff(i);
202202
bp2 = &BI_AuxBuff;
203203
bp2->Buff = &bp->Buff[length];
204-
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
204+
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
205205
/*
206206
* Fill in distance vector
207207
*/
@@ -254,7 +254,7 @@ F_VOID_FUNC sgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
254254
bp = BI_GetBuff(length*2);
255255
bp2 = &BI_AuxBuff;
256256
bp2->Buff = &bp->Buff[length];
257-
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
257+
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
258258
}
259259
bp->N = bp2->N = N;
260260
bp->dtype = bp2->dtype = MPI_FLOAT;
@@ -280,7 +280,7 @@ F_VOID_FUNC sgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
280280
ctxt->scp->comm);
281281
if (ctxt->scp->Iam == dest)
282282
{
283-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
283+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp2->Buff);
284284
if (Mpval(ldia) != -1)
285285
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
286286
(BI_DistType *) &bp2->Buff[idist],
@@ -291,7 +291,7 @@ F_VOID_FUNC sgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
291291
{
292292
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, BlacComb,
293293
ctxt->scp->comm);
294-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
294+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp2->Buff);
295295
if (Mpval(ldia) != -1)
296296
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
297297
(BI_DistType *) &bp2->Buff[idist],
@@ -370,6 +370,6 @@ F_VOID_FUNC sgamn2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
370370
/*
371371
* Unpack the amn array
372372
*/
373-
if (bp != &BI_AuxBuff) BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
373+
if (bp != &BI_AuxBuff) BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
374374
}
375375
}

‎BLACS/SRC/sgamx2d_.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ F_VOID_FUNC sgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
201201
bp = BI_GetBuff(i);
202202
bp2 = &BI_AuxBuff;
203203
bp2->Buff = &bp->Buff[length];
204-
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
204+
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
205205
/*
206206
* Fill in distance vector
207207
*/
@@ -254,7 +254,7 @@ F_VOID_FUNC sgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
254254
bp = BI_GetBuff(length*2);
255255
bp2 = &BI_AuxBuff;
256256
bp2->Buff = &bp->Buff[length];
257-
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
257+
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
258258
}
259259
bp->N = bp2->N = N;
260260
bp->dtype = bp2->dtype = MPI_FLOAT;
@@ -280,7 +280,7 @@ F_VOID_FUNC sgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
280280
ctxt->scp->comm);
281281
if (ctxt->scp->Iam == dest)
282282
{
283-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
283+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp2->Buff);
284284
if (Mpval(ldia) != -1)
285285
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
286286
(BI_DistType *) &bp2->Buff[idist],
@@ -291,7 +291,7 @@ F_VOID_FUNC sgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
291291
{
292292
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, BlacComb,
293293
ctxt->scp->comm);
294-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
294+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp2->Buff);
295295
if (Mpval(ldia) != -1)
296296
BI_TransDist(ctxt, tscope, Mpval(m), Mpval(n), rA, cA, tldia,
297297
(BI_DistType *) &bp2->Buff[idist],
@@ -370,6 +370,6 @@ F_VOID_FUNC sgamx2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
370370
/*
371371
* Unpack the amx array
372372
*/
373-
if (bp != &BI_AuxBuff) BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
373+
if (bp != &BI_AuxBuff) BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
374374
}
375375
}

‎BLACS/SRC/sgsum2d_.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ F_VOID_FUNC sgsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
151151
bp = BI_GetBuff(length*2);
152152
bp2 = &BI_AuxBuff;
153153
bp2->Buff = &bp->Buff[length];
154-
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
154+
BI_smvcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
155155
}
156156
bp->dtype = bp2->dtype = MPI_FLOAT;
157157
bp->N = bp2->N = N;
@@ -164,13 +164,13 @@ F_VOID_FUNC sgsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
164164
ierr=MPI_Reduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, MPI_SUM,
165165
dest, ctxt->scp->comm);
166166
if (ctxt->scp->Iam == dest)
167-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
167+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp2->Buff);
168168
}
169169
else
170170
{
171171
ierr=MPI_Allreduce(bp->Buff, bp2->Buff, bp->N, bp->dtype, MPI_SUM,
172172
ctxt->scp->comm);
173-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp2->Buff);
173+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp2->Buff);
174174
}
175175
if (BI_ActiveQ) BI_UpdateBuffs(NULL);
176176
return;
@@ -224,7 +224,7 @@ F_VOID_FUNC sgsum2d_(Int *ConTxt, F_CHAR scope, F_CHAR top, Int *m, Int *n,
224224
if (bp != &BI_AuxBuff)
225225
{
226226
if ( (ctxt->scp->Iam == dest) || (dest == -1) )
227-
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, bp->Buff);
227+
BI_svmcopy(Mpval(m), Mpval(n), A, tlda, (float*)bp->Buff);
228228
BI_UpdateBuffs(bp);
229229
}
230230
else

0 commit comments

Comments
 (0)