Skip to content

Commit ff16d6a

Browse files
committed
fixed Worker bug
1 parent 110780c commit ff16d6a

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

jni/src/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
VERSION="1.1.0-cuda7.5"
4-
DEVVERSION="dev-cuda7.5"
3+
VERSION="1.1.1-cuda8.0"
4+
DEVVERSION="dev-cuda8.0"
55

66
OS=`uname -a`
77
PARLIB=$1

src/main/C/newparse/makefile.gcc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,9 @@ $(EXES): $(OBJS)
3434

3535
gzstream.o: gzstream.h
3636

37+
install: $(EXES)
38+
cp *.exe ../../../../cbin
39+
cp *.exe ../../../../src/main/resources/cbin
40+
3741
clean:
3842
rm -f $(EXES) *.o *.lxc

src/main/C/newparse/makefile.w32

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,9 @@ $(EXES): $(OBJS)
3434

3535
gzstream.obj: gzstream.h
3636

37+
install: $(EXES)
38+
cp *.exe ../../../../cbin
39+
cp *.exe ../../../../src/main/resources/cbin
40+
3741
clean:
3842
rm -f $(EXES) *.obj *.lxc

src/main/scala/BIDMach/allreduce/Worker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Worker(override val opts:Worker.Opts = new Worker.Options) extends Host {
5050
groups = new Groups(M, gmods.data, gridmachines.data, 0);
5151
workers = workers0;
5252
if (machine != null) machine.stop;
53-
machine = new Machine(null, groups, imach, M, opts.useLong, opts.bufsize, false, opts.machineTrace, opts.replicate, workers.map(x => x.toString()));
53+
machine = new Machine(null, groups, imach, M, opts.useLong, opts.bufsize, false, opts.machineTrace, opts.replicate, workers);
5454
machine.configTimeout = opts.configTimeout;
5555
machine.reduceTimeout = opts.reduceTimeout;
5656
machine.sendTimeout = opts.sendTimeout;

0 commit comments

Comments
 (0)