Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix data race condition when calling Product method on dense matrixes #16

Open
wants to merge 1 commit into
base: go1
Choose a base branch
from
Open

fix data race condition when calling Product method on dense matrixes #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions dense_arithmetic.go
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

package matrix

import "runtime"
import (
"runtime"
"sync/atomic"
)

func (A *DenseMatrix) Plus(B MatrixRO) (Matrix, error) {
C := A.Copy()
Expand Down Expand Up @@ -167,32 +170,33 @@ func parTimes1(A, B, C *DenseMatrix) {
func parTimes2(A, B, C *DenseMatrix) {
const threshold = 8

currentGoroutineCount := 1
maxGoroutines := runtime.GOMAXPROCS(0) + 2
var currentGoroutineCount int32 = 1
maxGoroutines := int32(runtime.GOMAXPROCS(0) + 2)

var aux func(sync chan bool, A, B, C *DenseMatrix, rs, re, cs, ce, ks, ke int)
aux = func(sync chan bool, A, B, C *DenseMatrix, rs, re, cs, ce, ks, ke int) {
dr := re - rs
dc := ce - cs
dk := ke - ks
currentCount := atomic.LoadInt32(&currentGoroutineCount)
switch {
case currentGoroutineCount < maxGoroutines && dr >= dc && dr >= dk && dr >= threshold:
case currentCount < maxGoroutines && dr >= dc && dr >= dk && dr >= threshold:
sync0 := make(chan bool, 1)
rm := (rs + re) / 2
currentGoroutineCount++
atomic.AddInt32(&currentGoroutineCount, 1)
go aux(sync0, A, B, C, rs, rm, cs, ce, ks, ke)
aux(nil, A, B, C, rm, re, cs, ce, ks, ke)
<-sync0
currentGoroutineCount--
case currentGoroutineCount < maxGoroutines && dc >= dk && dc >= dr && dc >= threshold:
atomic.AddInt32(&currentGoroutineCount, -1)
case currentCount < maxGoroutines && dc >= dk && dc >= dr && dc >= threshold:
sync0 := make(chan bool, 1)
cm := (cs + ce) / 2
currentGoroutineCount++
atomic.AddInt32(&currentGoroutineCount, 1)
go aux(sync0, A, B, C, rs, re, cs, cm, ks, ke)
aux(nil, A, B, C, rs, re, cm, ce, ks, ke)
<-sync0
currentGoroutineCount--
case currentGoroutineCount < maxGoroutines && dk >= dc && dk >= dr && dk >= threshold:
atomic.AddInt32(&currentGoroutineCount, -1)
case currentCount < maxGoroutines && dk >= dc && dk >= dr && dk >= threshold:
km := (ks + ke) / 2
aux(nil, A, B, C, rs, re, cs, ce, ks, km)
aux(nil, A, B, C, rs, re, cs, ce, km, ke)
Expand Down Expand Up @@ -245,8 +249,8 @@ func (A *DenseMatrix) TimesDenseFill(B, C *DenseMatrix) (err error) {
default:
for i := 0; i < A.rows; i++ {
sums := C.elements[i*C.step : (i+1)*C.step]
for k, a := range A.elements[i*A.step : i*A.step + A.cols] {
for j, b := range B.elements[k*B.step : k * B.step + B.cols] {
for k, a := range A.elements[i*A.step : i*A.step+A.cols] {
for j, b := range B.elements[k*B.step : k*B.step+B.cols] {
sums[j] += a * b
}
}
Expand Down