From f2e38b52b1c483124a044a3a3ebed9d347c59c15 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Thu, 5 Sep 2024 08:53:42 +0200 Subject: [PATCH] data.vespa.oath.cloud -> data.vespa-cloud.com --- lib/performance_test.rb | 2 +- tests/container/local_llm/app/services.xml | 2 +- tests/performance/colbert_embedding/app/services.xml | 4 ++-- .../colbert_embedding/colbert_embedding.rb | 2 +- .../common/run_es_benchmarks.py | 2 +- .../common/run_vespa_benchmarks.py | 2 +- .../ecommerce_hybrid_search_base.rb | 2 +- tests/performance/embedding/app/services.xml | 4 ++-- tests/performance/embedding/embedding.rb | 2 +- tests/performance/llama/app/services.xml | 2 +- tests/performance/llama_7b/app/services.xml | 2 +- tests/performance/mixed_tensor_max_sim/maxsim.rb | 2 +- .../nearest_neighbor_distance_metrics.rb | 2 +- .../nearest_neighbor_distance_metrics.rb | 2 +- tests/performance/onnxmodel/onnxmodel.rb | 2 +- .../significance_model/significance_model.rb | 2 +- tests/search/embedding/embedding.rb | 12 ++++++------ 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/performance_test.rb b/lib/performance_test.rb index 2095141f4..d41c0e3a3 100644 --- a/lib/performance_test.rb +++ b/lib/performance_test.rb @@ -459,7 +459,7 @@ def vespa_destination_stop # Downloads the given file from s3 to the given vespa node. # If the file already exists in the test directory, use that directly instead. def download_file_from_s3(file_name, vespa_node, dir = "") - url = "https://data.vespa.oath.cloud/tests/performance/#{dir}" + url = "https://data.vespa-cloud.com/tests/performance/#{dir}" if File.exists?(selfdir + file_name) # Place the file in the test directory to avoid downloading during manual testing. puts "Using local file #{file_name}" diff --git a/tests/container/local_llm/app/services.xml b/tests/container/local_llm/app/services.xml index 4bc087b67..7111af1ee 100755 --- a/tests/container/local_llm/app/services.xml +++ b/tests/container/local_llm/app/services.xml @@ -15,7 +15,7 @@ - + 512 1 diff --git a/tests/performance/colbert_embedding/app/services.xml b/tests/performance/colbert_embedding/app/services.xml index 375f87a18..474d3112b 100644 --- a/tests/performance/colbert_embedding/app/services.xml +++ b/tests/performance/colbert_embedding/app/services.xml @@ -5,8 +5,8 @@ - - + + diff --git a/tests/performance/colbert_embedding/colbert_embedding.rb b/tests/performance/colbert_embedding/colbert_embedding.rb index 2d4fdba47..25fca83ec 100644 --- a/tests/performance/colbert_embedding/colbert_embedding.rb +++ b/tests/performance/colbert_embedding/colbert_embedding.rb @@ -15,7 +15,7 @@ def test_colbert start feed_file = "product-search-products.jsonl.zstd" - remote_file = "https://data.vespa.oath.cloud/sample-apps-data/#{feed_file}" + remote_file = "https://data.vespa-cloud.com/sample-apps-data/#{feed_file}" local_file = dirs.tmpdir + feed_file local_feed_file = dirs.tmpdir + "feed.json" cmd = "wget -O'#{local_file}' '#{remote_file}'" diff --git a/tests/performance/ecommerce_hybrid_search/common/run_es_benchmarks.py b/tests/performance/ecommerce_hybrid_search/common/run_es_benchmarks.py index 5b6597e58..529f69574 100644 --- a/tests/performance/ecommerce_hybrid_search/common/run_es_benchmarks.py +++ b/tests/performance/ecommerce_hybrid_search/common/run_es_benchmarks.py @@ -59,7 +59,7 @@ class Mode(Enum): import pathlib from tqdm import tqdm -download_base_url = "https://data.vespa.oath.cloud/tests/performance/ecommerce_hybrid_search" +download_base_url = "https://data.vespa-cloud.com/tests/performance/ecommerce_hybrid_search" def download_file(url, file_path): try: diff --git a/tests/performance/ecommerce_hybrid_search/common/run_vespa_benchmarks.py b/tests/performance/ecommerce_hybrid_search/common/run_vespa_benchmarks.py index 2fe56136b..48951f558 100644 --- a/tests/performance/ecommerce_hybrid_search/common/run_vespa_benchmarks.py +++ b/tests/performance/ecommerce_hybrid_search/common/run_vespa_benchmarks.py @@ -58,7 +58,7 @@ class Mode(Enum): import pathlib from tqdm import tqdm -download_base_url = "https://data.vespa.oath.cloud/tests/performance/ecommerce_hybrid_search" +download_base_url = "https://data.vespa-cloud.com/tests/performance/ecommerce_hybrid_search" def download_file(url, file_path): try: diff --git a/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_base.rb b/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_base.rb index f6fdbf6d8..bc9cec9a1 100644 --- a/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_base.rb +++ b/tests/performance/ecommerce_hybrid_search/ecommerce_hybrid_search_base.rb @@ -17,7 +17,7 @@ def system_metric_filler(system_sampler) end end - def download_file(file_name, vespa_node, url="https://data.vespa.oath.cloud/tests/performance/ecommerce_hybrid_search") + def download_file(file_name, vespa_node, url="https://data.vespa-cloud.com/tests/performance/ecommerce_hybrid_search") if File.exists?(selfdir + file_name) # Place the file in the test directory to avoid downloading during manual testing. puts "Using local file: #{file_name}" diff --git a/tests/performance/embedding/app/services.xml b/tests/performance/embedding/app/services.xml index 7779e4ccd..b4c5fe439 100644 --- a/tests/performance/embedding/app/services.xml +++ b/tests/performance/embedding/app/services.xml @@ -5,8 +5,8 @@ - - + + output_0 diff --git a/tests/performance/embedding/embedding.rb b/tests/performance/embedding/embedding.rb index 67f93820f..d89d543e8 100644 --- a/tests/performance/embedding/embedding.rb +++ b/tests/performance/embedding/embedding.rb @@ -14,7 +14,7 @@ def test_huggingface deploy(selfdir + "app") start feed_file = 'miracl-te-docs.100k.json.gz' - remote_file = "https://data.vespa.oath.cloud/tests/performance/#{feed_file}" + remote_file = "https://data.vespa-cloud.com/tests/performance/#{feed_file}" local_file = dirs.tmpdir + feed_file cmd = "wget -O'#{local_file}' '#{remote_file}'" puts "Running command #{cmd}" diff --git a/tests/performance/llama/app/services.xml b/tests/performance/llama/app/services.xml index aeade0a59..f9dfed691 100644 --- a/tests/performance/llama/app/services.xml +++ b/tests/performance/llama/app/services.xml @@ -14,7 +14,7 @@ - + 8192 40 diff --git a/tests/performance/llama_7b/app/services.xml b/tests/performance/llama_7b/app/services.xml index 30948ecc5..2ded70ac6 100644 --- a/tests/performance/llama_7b/app/services.xml +++ b/tests/performance/llama_7b/app/services.xml @@ -14,7 +14,7 @@ - + 2048 1 diff --git a/tests/performance/mixed_tensor_max_sim/maxsim.rb b/tests/performance/mixed_tensor_max_sim/maxsim.rb index 0f9a480a2..7bbbe3554 100644 --- a/tests/performance/mixed_tensor_max_sim/maxsim.rb +++ b/tests/performance/mixed_tensor_max_sim/maxsim.rb @@ -17,7 +17,7 @@ def test_max_sim_performance_1d deploy_app(SearchApp.new.sd(selfdir + 'page.sd')) start - remote_file = "https://data.vespa.oath.cloud/tests/performance/max-sim-colpali-vectors.json.zst" + remote_file = "https://data.vespa-cloud.com/tests/performance/max-sim-colpali-vectors.json.zst" cmd = "curl -s '#{remote_file}' | zstdcat" #can also use local file #cmd = " cat #{selfdir}max-sim-colpali-vectors.json.zst | zstdcat" diff --git a/tests/performance/nearest_neighbor_distance_metrics/nearest_neighbor_distance_metrics.rb b/tests/performance/nearest_neighbor_distance_metrics/nearest_neighbor_distance_metrics.rb index 8de3e6759..1666e6869 100644 --- a/tests/performance/nearest_neighbor_distance_metrics/nearest_neighbor_distance_metrics.rb +++ b/tests/performance/nearest_neighbor_distance_metrics/nearest_neighbor_distance_metrics.rb @@ -15,7 +15,7 @@ def test_metrics start feed_file = "product-search-products.jsonl.zstd" - remote_file = "https://data.vespa.oath.cloud/sample-apps-data/#{feed_file}" + remote_file = "https://data.vespa-cloud.com/sample-apps-data/#{feed_file}" local_file = dirs.tmpdir + feed_file local_feed_file = dirs.tmpdir + "feed.json" cmd = "wget -O'#{local_file}' '#{remote_file}'" diff --git a/tests/performance/nearest_neighbor_distance_metrics_and_types/nearest_neighbor_distance_metrics.rb b/tests/performance/nearest_neighbor_distance_metrics_and_types/nearest_neighbor_distance_metrics.rb index dd2eadd6c..4e8e7b0ff 100644 --- a/tests/performance/nearest_neighbor_distance_metrics_and_types/nearest_neighbor_distance_metrics.rb +++ b/tests/performance/nearest_neighbor_distance_metrics_and_types/nearest_neighbor_distance_metrics.rb @@ -16,7 +16,7 @@ def test_metrics_and_types deploy_app(SearchApp.new.sd(selfdir + 'vector.sd')) start - remote_file = "https://data.vespa.oath.cloud/tests/performance/vectors.100k.perf.json.zst" + remote_file = "https://data.vespa-cloud.com/tests/performance/vectors.100k.perf.json.zst" cmd = "curl -s '#{remote_file}' | zstdcat" run_stream_feeder(cmd, []) diff --git a/tests/performance/onnxmodel/onnxmodel.rb b/tests/performance/onnxmodel/onnxmodel.rb index 1b7a75900..5a2647b21 100644 --- a/tests/performance/onnxmodel/onnxmodel.rb +++ b/tests/performance/onnxmodel/onnxmodel.rb @@ -60,7 +60,7 @@ def test_onnx_deploy end def fetch_model - remote_file = "https://data.vespa.oath.cloud/tests/performance/#{@onnx_filename}" + remote_file = "https://data.vespa-cloud.com/tests/performance/#{@onnx_filename}" local_file = "#{Environment.instance.vespa_home}/tmp/#{@onnx_filename}" cmd = "wget -O'#{local_file}' '#{remote_file}'" puts "Running command #{cmd}" diff --git a/tests/performance/significance_model/significance_model.rb b/tests/performance/significance_model/significance_model.rb index 906573673..5ffc4a33b 100644 --- a/tests/performance/significance_model/significance_model.rb +++ b/tests/performance/significance_model/significance_model.rb @@ -35,7 +35,7 @@ def test_weak_and_bm25 end def get_app - model_url = "https://data.vespa.oath.cloud/tests/performance/significance_model/enwiki-20240620.json" + model_url = "https://data.vespa-cloud.com/tests/performance/significance_model/enwiki-20240620.json" SearchApp.new. sd(selfdir + 'product.sd'). search_dir(selfdir + "search"). diff --git a/tests/search/embedding/embedding.rb b/tests/search/embedding/embedding.rb index ad9c50f35..311c3669a 100644 --- a/tests/search/embedding/embedding.rb +++ b/tests/search/embedding/embedding.rb @@ -23,21 +23,21 @@ def sentencepiece_tokenizer_component def bert_embedder_component Component.new('transformer'). type('bert-embedder'). - param('transformer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa.oath.cloud/onnx_models/sentence_all_MiniLM_L6_v2.onnx' }). + param('transformer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa-cloud.com/onnx_models/sentence_all_MiniLM_L6_v2.onnx' }). param('tokenizer-vocab', '', {'model-id' => 'ignored-on-selfhosted', 'path' => 'components/bert-base-uncased.txt'}) end def huggingface_tokenizer_component Component.new('tokenizer'). type('hugging-face-tokenizer'). - param('model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa.oath.cloud/onnx_models/paraphrase-multilingual-MiniLM-L12-v2.tokenizer.json'}) + param('model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa-cloud.com/onnx_models/paraphrase-multilingual-MiniLM-L12-v2.tokenizer.json'}) end def huggingface_embedder_component Component.new('huggingface'). type('hugging-face-embedder'). - param('transformer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa.oath.cloud/onnx_models/paraphrase-multilingual-MiniLM-L12-v2.onnx'}). - param('tokenizer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa.oath.cloud/onnx_models/paraphrase-multilingual-MiniLM-L12-v2.tokenizer.json'}). + param('transformer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa-cloud.com/onnx_models/paraphrase-multilingual-MiniLM-L12-v2.onnx'}). + param('tokenizer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa-cloud.com/onnx_models/paraphrase-multilingual-MiniLM-L12-v2.tokenizer.json'}). param('transformer-output', 'output_0') end @@ -52,8 +52,8 @@ def huggingface_embedder_binarization_component def colbert_embedder_component Component.new('colbert'). type('colbert-embedder'). - param('transformer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa.oath.cloud/onnx_models/vespa-colMiniLM-L-6-dynamic-quantized.onnx'}). - param('tokenizer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa.oath.cloud/onnx_models/e5-small-v2/tokenizer.json'}) + param('transformer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa-cloud.com/onnx_models/vespa-colMiniLM-L-6-dynamic-quantized.onnx'}). + param('tokenizer-model', '', {'model-id' => 'ignored-on-selfhosted', 'url' => 'https://data.vespa-cloud.com/onnx_models/e5-small-v2/tokenizer.json'}) end def colbert_embedder_component_fp16