Adjust speed knobs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/annotate.go b/annotate.go
index 449e64bb3449906e561cb583b0fe77caa6a8dbca..b0247165eafffcde4c6d1bbcaa07bfd9f52c42af 100644 (file)
--- a/annotate.go
+++ b/annotate.go
@@ -152,7 +152,7 @@ func (cmd *annotatecmd) exportTileDiffs(outw io.Writer, tilelib *tileLibrary) er
        sort.Strings(refs)
        log.Infof("len(refs) %d", len(refs))
 
-       outch := make(chan string, 1)
+       outch := make(chan string, runtime.NumCPU()*2)
        var outwg sync.WaitGroup
        defer outwg.Wait()
        outwg.Add(1)
@@ -169,7 +169,7 @@ func (cmd *annotatecmd) exportTileDiffs(outw io.Writer, tilelib *tileLibrary) er
                nseqs += len(refcs)
        }
 
-       throttle := &throttle{Max: runtime.NumCPU() + nseqs + 1}
+       throttle := &throttle{Max: runtime.NumCPU()*2 + nseqs*2 + 1}
        defer throttle.Wait()
 
        for _, refname := range refs {

diff --git a/exportnumpy.go b/exportnumpy.go
index fdedf69816c5033840a3eb15ed3472107a1bb3fe..af6f35960c81133427f537944ccb5071b63a89e0 100644 (file)
--- a/exportnumpy.go
+++ b/exportnumpy.go
@@ -126,7 +126,7 @@ func (cmd *exportNumpy) RunCommand(prog string, args []string, stdin io.Reader,
                        return 1
                }
                defer annow.Close()
-               err = (&annotatecmd{maxTileSize: 50000}).exportTileDiffs(annow, tilelib)
+               err = (&annotatecmd{maxTileSize: 5000}).exportTileDiffs(annow, tilelib)
                if err != nil {
                        return 1
                }