EdgeAvg implemented on GPU, now fully functional with ndata

Author: rcoreilly

examples/color_gabor/color_gabor.go

@@ -139,13 +139,11 @@ type Vis struct { //types:add
 
 	v1sIdxs [3]int
 
-	fadeOpIdx int
-
 	v1sMaxIdx, v1cPoolIdx, v1cMaxPolIdx, v1cPolPoolIdx, v1cLenSumIdx, v1cEndStopIdx int
 }
 
 func (vi *Vis) Defaults() {
-	vi.GPU = true
+	vi.GPU = false // true
 	vi.ColorGain = 8
 	vi.SplitColor = true
 	vi.ImageFile = core.Filename("car_004_00001.png")
@@ -179,7 +177,8 @@ func (vi *Vis) Config() {
 	vi.ImageTsr = vi.V1.Images.SubSpace(img, 0).(*tensor.Float32)
 	vi.ImageLMSTsr = vi.V1.Images.SubSpace(lms, 0).(*tensor.Float32)
 
-	vi.fadeOpIdx = vi.V1.NewFadeImage(img, 3, wrap, int(vi.V1sGeom.Border.X), .5, .5, .5, &vi.V1sGeom)
+	avgIdx := vi.V1.NewEdgeAvg(img, 3, int(vi.V1sGeom.Border.X), &vi.V1sGeom)
+	vi.V1.NewFadeImage(img, 3, wrap, int(vi.V1sGeom.Border.X), avgIdx, &vi.V1sGeom)
 	vi.V1.NewLMSOpponents(wrap, lms, vi.ColorGain, &vi.V1sGeom)
 
 	nang := vi.V1sGabor.NAngles
@@ -272,13 +271,9 @@ func (vi *Vis) Filter() error { //types:add
 	if err != nil {
 		return errors.Log(err)
 	}
-	// todo:
-	// r, g, b := v1vision.EdgeAvg(vi.ImageTsr, int(vi.V1sGeom.Border.X))
-	// vi.V1.SetFadeRGB(vi.fadeOpIdx, r, g, b)
-
 	tmr := timer.Time{}
 	tmr.Start()
-	for range 1000 {
+	for range 1 {
 		vi.V1.Run()
 		// vi.V1.Run(v1vision.Values4DVar) // this is sig slower due to sync issues.
 		// for timing test, run without sync and assume it gets sig better.

v1std/v1c_color.go

@@ -58,8 +58,6 @@ type V1cColor struct {
 	// (0, 45, 90, 135) and the 5 are: 1 length-sum, 2 directions of end-stop,
 	// and 2 polarities of V1simple.
 	Output *tensor.Float32 `display:"no-inline"`
-
-	fadeOpIdx int
 }
 
 func (vi *V1cColor) Defaults() {
@@ -95,7 +93,8 @@ func (vi *V1cColor) Config(ndata int, imageSize image.Point) {
 	wrap := vi.V1.NewImage(vi.V1sGeom.In.V())
 	lms := vi.V1.NewImage(vi.V1sGeom.In.V())
 
-	vi.fadeOpIdx = vi.V1.NewFadeImage(img, 3, wrap, int(vi.V1sGeom.Border.X), .5, .5, .5, &vi.V1sGeom)
+	avgIdx := vi.V1.NewEdgeAvg(img, 3, int(vi.V1sGeom.Border.X), &vi.V1sGeom)
+	vi.V1.NewFadeImage(img, 3, wrap, int(vi.V1sGeom.Border.X), avgIdx, &vi.V1sGeom)
 	vi.V1.NewLMSOpponents(wrap, lms, vi.ColorGain, &vi.V1sGeom)
 
 	nang := vi.V1sGabor.NAngles
@@ -162,10 +161,6 @@ func (vi *V1cColor) RunImages(im *Image, imgs ...image.Image) {
 	vi.V1.SetAsCurrent()
 	v1vision.UseGPU = vi.GPU
 	im.SetImagesRGB(&vi.V1, int(vi.V1sGeom.Border.X), imgs...)
-	// argh: this is not going to work here:
-	// need to do this on-chip.
-	// r, g, b := v1vision.EdgeAvg(im.Tsr, int(vi.V1sGeom.Border.X))
-	// vi.V1.SetFadeRGB(vi.fadeOpIdx, r, g, b)
 	vi.V1.Run(v1vision.Values4DVar)
 	vi.Output = vi.V1.Values4D.SubSpace(0).(*tensor.Float32)
 }

v1std/v1c_multi.go

@@ -245,8 +245,6 @@ type V1cMulti struct {
 
 	// Image manages images.
 	Image Image
-
-	fadeOpIdx int
 }
 
 func (vi *V1cMulti) Defaults() {
@@ -338,7 +336,8 @@ func (vi *V1cMulti) Config(ndata int) {
 	lmsBY := vi.V1.NewImage(inSz)
 	_, _ = lmsRG, lmsBY
 
-	vi.fadeOpIdx = vi.V1.NewFadeImage(img, 3, wrap, int(v1sGeom.Border.X), .5, .5, .5, v1sGeom)
+	avgIdx := vi.V1.NewEdgeAvg(img, 3, int(v1sGeom.Border.X), v1sGeom)
+	vi.V1.NewFadeImage(img, 3, wrap, int(v1sGeom.Border.X), avgIdx, v1sGeom)
 	vi.V1.NewLMSOpponents(wrap, lmsOp, vi.ColorGain, v1sGeom)
 	if len(vi.DoGParams) > 0 {
 		dogGeom := &vi.DoGParams[0].Geom
@@ -373,9 +372,6 @@ func (vi *V1cMulti) RunImages(imgs ...image.Image) {
 	v1vision.UseGPU = vi.GPU
 	v1sGeom := &vi.V1cParams[0].V1sGeom
 	vi.Image.SetImagesRGB(&vi.V1, int(v1sGeom.Border.X), imgs...)
-	// todo:
-	// r, g, b := v1vision.EdgeAvg(vi.Image.Tsr, int(v1sGeom.Border.X))
-	// vi.V1.SetFadeRGB(vi.fadeOpIdx, r, g, b)
 	vi.V1.Run(v1vision.Values4DVar)
 	for _, vp := range vi.V1cParams {
 		vp.SetOutput(vi)