Skip to content

Commit 2501e1b

Browse files
committed
replace isend
1 parent 6a9d59f commit 2501e1b

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
2013-07-03: Ver. 0.1-6
1+
2013-07-05: Ver. 0.1-6
22
* Move inst/doc/vignettes/ to vignettes/.
3+
* Avoid isend() in load.balance().
34

45
2013-07-02: Ver. 0.1-5
56
* Add high-level functions "pmclust" and "pkmeans".

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ URL: http://r-pbd.org/
2525
BugReports: http://group.r-pbd.org/
2626
MailingList: Please send questions and comments regarding pbdR to
2727
28-
Packaged: 2013-07-03 17:57:53 UTC; snoweye
28+
Packaged: 2013-07-04 18:44:09 UTC; snoweye
2929
Author: Wei-Chen Chen [aut, cre],
3030
George Ostrouchov [aut]
3131
Maintainer: Wei-Chen Chen <[email protected]>

R/02_load_balance.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ load.balance <- function(X.spmd, bal.info = NULL, comm = .SPMD.CT$comm,
8888
for(i in send.to){
8989
if(i != COMM.RANK){
9090
tmp <- matrix(X.spmd[bal.info$send$belong == i,], ncol = p)
91-
isend(tmp, rank.dest = i, tag = COMM.RANK, comm = comm)
91+
send(tmp, rank.dest = i, tag = COMM.RANK, comm = comm)
9292
}
9393
}
9494
} else{
9595
for(i in send.to){
9696
if(i != COMM.RANK){
9797
tmp <- matrix(X.spmd[, bal.info$send$belong == i], nrow = p)
98-
isend(tmp, rank.dest = i, tag = COMM.RANK, comm = comm)
98+
send(tmp, rank.dest = i, tag = COMM.RANK, comm = comm)
9999
}
100100
}
101101
}

R/pm_my_tools.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ set.global <- function(K = 2, X.spmd = NULL, PARAM = NULL,
1111
if(A){
1212
# It is default and does not thing.
1313
} else if(B){
14-
.pmclustEnv$X.spmd <- X.gbd
15-
X.spmd <- X.gbd
14+
X.spmd <- get("X.gbd", envir = .pmclustEnv)
15+
.pmclustEnv$X.spmd <- X.spmd
1616
} else{
1717
comm.stop("A global X.spmd or X.gbd does not exist.")
1818
}

inst/doc/pmclust-guide.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
### R code from vignette source 'pmclust-guide.Rnw'
2+

inst/doc/pmclust-guide.pdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)