Update of obipcr and homogenization of logging

Former-commit-id: 46abf47c19ace5248042c02cf1f81d9f6c12eb10
This commit is contained in:
Eric Coissac
2024-05-16 15:18:30 +02:00
parent 61be8a55b1
commit 55ce36f329
27 changed files with 345 additions and 58 deletions

View File

@@ -136,7 +136,7 @@ func CLIReadBioSequences(filenames ...string) (obiiter.IBioSequence, error) {
nreader := 1
if CLINoInputOrder() {
nreader = obioptions.CLIParallelWorkers()
nreader = obioptions.ParallelFilesRead()
}
iterator = obiformats.ReadSequencesBatchFromFiles(

View File

@@ -1,7 +1,7 @@
package obicsv
import (
"log"
log "github.com/sirupsen/logrus"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiformats"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiiter"

View File

@@ -1,7 +1,7 @@
package obigrep
import (
"log"
log "github.com/sirupsen/logrus"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiiter"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obioptions"

View File

@@ -60,5 +60,5 @@ func CLIPCR(iterator obiiter.IBioSequence) (obiiter.IBioSequence, error) {
iterator = iterator.Pipe(frags)
}
return iterator.MakeISliceWorker(worker, false, obioptions.CLIParallelWorkers()), nil
return iterator.LimitMemory(0.5).MakeISliceWorker(worker, false, obioptions.CLIParallelWorkers()), nil
}

View File

@@ -2,7 +2,7 @@ package obirefidx
import (
"fmt"
"log"
log "github.com/sirupsen/logrus"
"sort"
"sync"

View File

@@ -221,5 +221,5 @@ func IndexReferenceDB(iterator obiiter.IBioSequence) obiiter.IBioSequence {
go f()
}
return indexed.Rebatch(1000)
return indexed.Rebatch(obioptions.CLIBatchSize())
}

View File

@@ -1,7 +1,8 @@
package obiscript
import (
"log"
log "github.com/sirupsen/logrus"
"os"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obitools/obiconvert"

View File

@@ -3,7 +3,7 @@ package obisplit
import (
"encoding/csv"
"fmt"
"log"
log "github.com/sirupsen/logrus"
"os"
"slices"

View File

@@ -1,7 +1,7 @@
package obitag
import (
"log"
log "github.com/sirupsen/logrus"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiformats"
"git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiiter"