Skip to content

Commit 7201793

Browse files
committed
update for new cuda stream API
1 parent f993dec commit 7201793

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

mapper32.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (m *mapper32) Map(in, out anyvec.Vector) {
6969
}
7070
grid, block := out32.kernelSizes()
7171
return m.creator.Handle.kernels32.Launch("mapForward", grid, 1, 1, block, 1, 1,
72-
0, out32.buffer, in32.buffer, m.table, m.outSize)
72+
0, nil, out32.buffer, in32.buffer, m.table, m.outSize)
7373
})
7474
}
7575

@@ -89,6 +89,6 @@ func (m *mapper32) MapTranspose(in, out anyvec.Vector) {
8989
}
9090
grid, block := in32.kernelSizes()
9191
return m.creator.Handle.kernels32.Launch("mapBackward", grid, 1, 1, block, 1, 1,
92-
0, out32.buffer, in32.buffer, m.table, m.outSize)
92+
0, nil, out32.buffer, in32.buffer, m.table, m.outSize)
9393
})
9494
}

vector32.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (v *vector32) AddScaler(s anyvec.Numeric) {
142142
}
143143
grid, block := v.kernelSizes()
144144
return v.creator.Handle.kernels32.Launch("addScaler", grid, 1, 1,
145-
block, 1, 1, 0, scaler, v.buffer, v.Len())
145+
block, 1, 1, 0, nil, scaler, v.buffer, v.Len())
146146
})
147147
}
148148

@@ -191,7 +191,7 @@ func (v *vector32) Div(other anyvec.Vector) {
191191
}
192192
grid, block := v.kernelSizes()
193193
return v.creator.Handle.kernels32.Launch("divElements", grid, 1, 1,
194-
block, 1, 1, 0, v.buffer, v1.buffer, v.Len())
194+
block, 1, 1, 0, nil, v.buffer, v1.buffer, v.Len())
195195
})
196196
}
197197

vector32_extra.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (v *vector32) unaryOp(kernel string) {
3939
}
4040
grid, block := v.kernelSizes()
4141
return v.creator.Handle.kernels32.Launch(kernel, grid, 1, 1, block, 1, 1,
42-
0, v.buffer, v.Len())
42+
0, nil, v.buffer, v.Len())
4343
})
4444
}
4545

@@ -80,7 +80,7 @@ func (v *vector32) AddChunks(other anyvec.Vector) {
8080
}
8181
grid, block := v.kernelSizes()
8282
return v.creator.Handle.kernels32.Launch("addChunks", grid, 1, 1, block, 1, 1,
83-
0, v.buffer, v1.buffer, v.Len(), v.Len()/v1.Len())
83+
0, nil, v.buffer, v1.buffer, v.Len(), v.Len()/v1.Len())
8484
})
8585
}
8686

@@ -107,7 +107,7 @@ func (v *vector32) randUniform() {
107107
}
108108
grid, block := v.kernelSizes()
109109
return v.creator.Handle.kernels32.Launch("shiftRandUniform", grid, 1, 1,
110-
block, 1, 1, 0, v.buffer, v.Len())
110+
block, 1, 1, 0, nil, v.buffer, v.Len())
111111
})
112112
}
113113

@@ -121,7 +121,7 @@ func (v *vector32) randBernoulli() {
121121
}
122122
grid, block := v.kernelSizes()
123123
return v.creator.Handle.kernels32.Launch("uniformToBernoulli", grid, 1, 1,
124-
block, 1, 1, 0, v.buffer, v.Len())
124+
block, 1, 1, 0, nil, v.buffer, v.Len())
125125
})
126126
}
127127

@@ -166,10 +166,10 @@ func (v *vector32) repeatedOp(kernel string, v1 *vector32) {
166166
if isPowerOf2(v1.Len()) {
167167
kernel += "Pow2"
168168
return v.creator.Handle.kernels32.Launch(kernel, grid, 1, 1, block, 1, 1,
169-
0, v.buffer, v1.buffer, v.Len(), v1.Len()-1)
169+
0, nil, v.buffer, v1.buffer, v.Len(), v1.Len()-1)
170170
} else {
171171
return v.creator.Handle.kernels32.Launch(kernel, grid, 1, 1, block, 1, 1,
172-
0, v.buffer, v1.buffer, v.Len(), v1.Len())
172+
0, nil, v.buffer, v1.buffer, v.Len(), v1.Len())
173173
}
174174
})
175175
}
@@ -237,7 +237,7 @@ func (v *vector32) compare(kernel string, alpha float32) {
237237
}
238238
grid, block := v.kernelSizes()
239239
return v.creator.Handle.kernels32.Launch(kernel, grid, 1, 1, block, 1, 1,
240-
0, alpha, v.buffer, v.Len())
240+
0, nil, alpha, v.buffer, v.Len())
241241
})
242242
}
243243

@@ -302,7 +302,7 @@ func (v *vector32) addLogsKernel(rows, cols int, dst, src cuda.Buffer, threads i
302302
}
303303
sharedSize := 4 * uint(threads)
304304
return v.creator.Handle.kernels32.Launch("addLogs", uint(rows), grid, 1,
305-
uint(threads), 1, 1, sharedSize, dst, src, uint(cols))
305+
uint(threads), 1, 1, sharedSize, nil, dst, src, uint(cols))
306306
}
307307

308308
func (v *vector32) ElemMax(other anyvec.Vector) {
@@ -314,7 +314,7 @@ func (v *vector32) ElemMax(other anyvec.Vector) {
314314
}
315315
grid, block := v.kernelSizes()
316316
return v.creator.Handle.kernels32.Launch("elemMax", grid, 1, 1, block, 1, 1,
317-
0, v.buffer, v1.buffer, v.Len())
317+
0, nil, v.buffer, v1.buffer, v.Len())
318318
})
319319
}
320320

@@ -343,7 +343,7 @@ func (v *vector32) LogSoftmax(chunkSize int) {
343343
}
344344
grid, block := v.kernelSizes()
345345
return v.creator.Handle.kernels32.Launch("subChunks", grid, 1, 1,
346-
block, 1, 1, 0, v.buffer, tmp, v.Len(), chunkSize)
346+
block, 1, 1, 0, nil, v.buffer, tmp, v.Len(), chunkSize)
347347
})
348348
}
349349

@@ -358,7 +358,7 @@ func (v *vector32) Pow(n anyvec.Numeric) {
358358
}
359359
grid, block := v.kernelSizes()
360360
return v.creator.Handle.kernels32.Launch("powScaler", grid, 1, 1,
361-
block, 1, 1, 0, scaler, v.buffer, v.Len())
361+
block, 1, 1, 0, nil, scaler, v.buffer, v.Len())
362362
})
363363
}
364364

@@ -385,7 +385,7 @@ func (v *vector32) MapMax(cols int) anyvec.Mapper {
385385
dummyVec := &vector32{size: rows}
386386
grid, block := dummyVec.kernelSizes()
387387
return v.creator.Handle.kernels32.Launch("mapMax", grid, 1, 1, block, 1, 1,
388-
0, buf, v.buffer, rows, cols)
388+
0, nil, buf, v.buffer, rows, cols)
389389
})
390390
return res
391391
}
@@ -412,7 +412,7 @@ func (v *vector32) SumRows(cols int) anyvec.Vector {
412412
dummy := vector32{size: rows}
413413
grid, block := dummy.kernelSizes()
414414
err = v.creator.Handle.kernels32.Launch("setScaler", grid, 1, 1,
415-
block, 1, 1, 0, float32(1), ones, rows)
415+
block, 1, 1, 0, nil, float32(1), ones, rows)
416416
if err != nil {
417417
return err
418418
}

0 commit comments

Comments
 (0)