From b6ecb1d44a6329f59bd421eda900d6cf4d6c30bf Mon Sep 17 00:00:00 2001 From: Michael Oviedo Date: Thu, 14 Nov 2024 12:26:57 -0800 Subject: [PATCH] Add configurable parameters to geonames operations (#498) * add configurable params to leftover operations in geonames Signed-off-by: Michael Oviedo * remove client operations Signed-off-by: Michael Oviedo --------- Signed-off-by: Michael Oviedo --- geonames/test_procedures/default.json | 62 ++++++++------------------- 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/geonames/test_procedures/default.json b/geonames/test_procedures/default.json index ef2ea0e4..683d0597 100644 --- a/geonames/test_procedures/default.json +++ b/geonames/test_procedures/default.json @@ -449,59 +449,31 @@ }, { "operation": "significant_text_selective", - "warmup-iterations": 200, - "iterations": 100 - {%- if not target_throughput %} - ,"target-throughput": 2 - {%- elif target_throughput is string and target_throughput.lower() == 'none' %} - {%- else %} - ,"target-throughput": {{ target_throughput | tojson }} - {%- endif %} - {%- if search_clients is defined and search_clients %} - ,"clients": {{ search_clients | tojson}} - {%- endif %} - }, + "warmup-iterations": {{ significant_text_selective_warmup_iterations or warmup_iterations | default(200) | tojson }}, + "iterations": {{ significant_text_selective_iterations or iterations | default(100) | tojson }}, + "target-throughput": {{ significant_text_selective_target_throughput or target_throughput | default(2) | tojson }}, + "clients": {{ significant_text_selective_search_clients or search_clients | tojson}} + }, { "operation": "significant_text_sampled_selective", - "warmup-iterations": 200, - "iterations": 100 - {%- if not target_throughput %} - ,"target-throughput": 20 - {%- elif target_throughput is string and target_throughput.lower() == 'none' %} - {%- else %} - ,"target-throughput": {{ target_throughput | tojson }} - {%- endif %} - {%- if search_clients is defined and search_clients %} - ,"clients": {{ search_clients | tojson}} - {%- endif %} + "warmup-iterations": {{ significant_text_sampled_selective_warmup_iterations or warmup_iterations | default(200) | tojson }}, + "iterations": {{ significant_text_sampled_selective_iterations or iterations | default(100) | tojson }}, + "target-throughput": {{ significant_text_sampled_selective_target_throughput or target_throughput | default(20) | tojson }}, + "clients": {{ significant_text_sampled_selective_search_clients or search_clients | tojson}} }, { "operation": "significant_text_unselective", - "warmup-iterations": 50, - "iterations": 20 - {%- if not target_throughput %} - ,"target-throughput": 0.04 - {%- elif target_throughput is string and target_throughput.lower() == 'none' %} - {%- else %} - ,"target-throughput": {{ target_throughput | tojson }} - {%- endif %} - {%- if search_clients is defined and search_clients %} - ,"clients": {{ search_clients | tojson}} - {%- endif %} + "warmup-iterations": {{ significant_text_unselective_warmup_iterations or warmup_iterations | default(50) | tojson }}, + "iterations": {{ significant_text_unselective_iterations or iterations | default(20) | tojson }}, + "target-throughput": {{ significant_text_unselective_target_throughput or target_throughput | default(0.04) | tojson }}, + "clients": {{ significant_text_unselective_search_clients or search_clients | tojson}} }, { "operation": "significant_text_sampled_unselective", - "warmup-iterations": 200, - "iterations": 100 - {%- if not target_throughput %} - ,"target-throughput": 6 - {%- elif target_throughput is string and target_throughput.lower() == 'none' %} - {%- else %} - ,"target-throughput": {{ target_throughput | tojson }} - {%- endif %} - {%- if search_clients is defined and search_clients %} - ,"clients": {{ search_clients | tojson}} - {%- endif %} + "warmup-iterations": {{ significant_text_sampled_unselective_warmup_iterations or warmup_iterations | default(200) | tojson }}, + "iterations": {{ significant_text_sampled_unselective_iterations or iterations | default(100) | tojson }}, + "target-throughput": {{ significant_text_sampled_unselective_target_throughput or target_throughput | default(6) | tojson }}, + "clients": {{ significant_text_sampled_unselective_search_clients or search_clients | tojson}} } ] }