Raise default LLM concurrency
This commit is contained in:
@@ -24,6 +24,9 @@ func TestMaintainedExamplesLoadResolveAndList(t *testing.T) {
|
|||||||
for _, example := range maintainedExampleFiles(t) {
|
for _, example := range maintainedExampleFiles(t) {
|
||||||
t.Run(example.name, func(t *testing.T) {
|
t.Run(example.name, func(t *testing.T) {
|
||||||
cfg := loadMaintainedExample(t, example.path)
|
cfg := loadMaintainedExample(t, example.path)
|
||||||
|
if example.name == "complete" && (cfg.Concurrency.TotalLLM != 2 || cfg.Concurrency.StageWorkers["extract"] != 2) {
|
||||||
|
t.Fatalf("complete example concurrency = %#v, want explicit limits of 2", cfg.Concurrency)
|
||||||
|
}
|
||||||
raw, err := os.ReadFile(example.transcriptPath)
|
raw, err := os.ReadFile(example.transcriptPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("read maintained transcript %q: %v", example.transcriptPath, err)
|
t.Fatalf("read maintained transcript %q: %v", example.transcriptPath, err)
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ type ConcurrencyConfig struct {
|
|||||||
defaultedExtractWorkers int
|
defaultedExtractWorkers int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const defaultLLMConcurrency = 16
|
||||||
|
|
||||||
type OutputConfig struct {
|
type OutputConfig struct {
|
||||||
Directory string `json:"directory"`
|
Directory string `json:"directory"`
|
||||||
}
|
}
|
||||||
@@ -60,9 +62,9 @@ func Default() Config {
|
|||||||
return Config{
|
return Config{
|
||||||
Pipelines: map[string]pipeline.PipelineProfile{},
|
Pipelines: map[string]pipeline.PipelineProfile{},
|
||||||
Concurrency: ConcurrencyConfig{
|
Concurrency: ConcurrencyConfig{
|
||||||
TotalLLM: 1,
|
TotalLLM: defaultLLMConcurrency,
|
||||||
StageWorkers: map[string]int{"extract": 1},
|
StageWorkers: map[string]int{"extract": defaultLLMConcurrency},
|
||||||
defaultedExtractWorkers: 1,
|
defaultedExtractWorkers: defaultLLMConcurrency,
|
||||||
},
|
},
|
||||||
Output: OutputConfig{Directory: "./notarius-output"},
|
Output: OutputConfig{Directory: "./notarius-output"},
|
||||||
Cache: CacheConfig{ChunkPlans: ChunkPlanCacheConfig{Mode: pipeline.ChunkCacheAuto}},
|
Cache: CacheConfig{ChunkPlans: ChunkPlanCacheConfig{Mode: pipeline.ChunkCacheAuto}},
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
|
|
||||||
func TestDefaultReturnsDocumentedValuesAndIndependentMaps(t *testing.T) {
|
func TestDefaultReturnsDocumentedValuesAndIndependentMaps(t *testing.T) {
|
||||||
first := Default()
|
first := Default()
|
||||||
if first.Concurrency.TotalLLM != 1 || first.Concurrency.StageWorkers["extract"] != 1 {
|
if first.Concurrency.TotalLLM != 16 || first.Concurrency.StageWorkers["extract"] != 16 {
|
||||||
t.Fatalf("concurrency defaults = %#v", first.Concurrency)
|
t.Fatalf("concurrency defaults = %#v", first.Concurrency)
|
||||||
}
|
}
|
||||||
if first.Output.Directory != "./notarius-output" || first.Debug.Directory != "./notarius-debug" {
|
if first.Output.Directory != "./notarius-output" || first.Debug.Directory != "./notarius-debug" {
|
||||||
@@ -31,7 +31,7 @@ func TestDefaultReturnsDocumentedValuesAndIndependentMaps(t *testing.T) {
|
|||||||
first.Concurrency.StageWorkers["other"] = 100
|
first.Concurrency.StageWorkers["other"] = 100
|
||||||
first.Pipelines["changed"] = pipeline.PipelineProfile{}
|
first.Pipelines["changed"] = pipeline.PipelineProfile{}
|
||||||
second := Default()
|
second := Default()
|
||||||
if second.Concurrency.StageWorkers["extract"] != 1 || len(second.Concurrency.StageWorkers) != 1 || len(second.Pipelines) != 0 {
|
if second.Concurrency.StageWorkers["extract"] != 16 || len(second.Concurrency.StageWorkers) != 1 || len(second.Pipelines) != 0 {
|
||||||
t.Fatalf("Default() returned state shared with an earlier result: %#v", second)
|
t.Fatalf("Default() returned state shared with an earlier result: %#v", second)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -45,7 +45,7 @@ func TestFileConfigMinimalVersion4AppliesOverDefaults(t *testing.T) {
|
|||||||
if cfg.Output.Directory != "./notarius-output" || cfg.Debug.Directory != "./notarius-debug" || cfg.Cache.ChunkPlans.Mode != pipeline.ChunkCacheAuto {
|
if cfg.Output.Directory != "./notarius-output" || cfg.Debug.Directory != "./notarius-debug" || cfg.Cache.ChunkPlans.Mode != pipeline.ChunkCacheAuto {
|
||||||
t.Fatalf("minimal file changed unrelated defaults: %#v", cfg)
|
t.Fatalf("minimal file changed unrelated defaults: %#v", cfg)
|
||||||
}
|
}
|
||||||
if cfg.Concurrency.TotalLLM != 1 || cfg.Concurrency.StageWorkers["extract"] != 1 || len(cfg.Pipelines) != 0 {
|
if cfg.Concurrency.TotalLLM != 16 || cfg.Concurrency.StageWorkers["extract"] != 16 || len(cfg.Pipelines) != 0 {
|
||||||
t.Fatalf("minimal file did not retain defaults: %#v", cfg)
|
t.Fatalf("minimal file did not retain defaults: %#v", cfg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user