From 7d4fd9466d246d51a490d3e82c3577005ab0bdea Mon Sep 17 00:00:00 2001 From: Thanawan Atchariyachanvanit Date: Wed, 23 Aug 2023 15:55:08 -0400 Subject: [PATCH] Backport/backport 237 to 1.x (#241) * updating notebook + bumping version (#199) * updating notebook + bumping version Signed-off-by: Dhrubo Saha * addressing comments Signed-off-by: Dhrubo Saha --------- Signed-off-by: Dhrubo Saha (cherry picked from commit 1237aa61bb40cf6cef06002cffa02093ef4b2023) * Add description field with make_model_config_json function (#203) * Add description field Signed-off-by: Thanawan Atchariyachanvanit * Restore notebook Signed-off-by: Thanawan Atchariyachanvanit * Debug test Signed-off-by: Thanawan Atchariyachanvanit * Resolve linting issues Signed-off-by: Thanawan Atchariyachanvanit * Update CHANGELOG.md Signed-off-by: Thanawan Atchariyachanvanit * Debug test_sentencetransformermodel_pytest.py Signed-off-by: Thanawan Atchariyachanvanit * Improve test coverage Signed-off-by: Thanawan Atchariyachanvanit * Edit test name Signed-off-by: Thanawan Atchariyachanvanit * Change CHANGELOG.md & Add comment to sentencetransformermodel.py Signed-off-by: Thanawan Atchariyachanvanit * Correct linting Signed-off-by: Thanawan Atchariyachanvanit * Improve add description Signed-off-by: Thanawan Atchariyachanvanit * Correct linting Signed-off-by: Thanawan Atchariyachanvanit * Loosen restriction Signed-off-by: Thanawan Atchariyachanvanit * Update sentencetransformermodel.py Signed-off-by: Thanawan Atchariyachanvanit * Change function name + Add comment + Add default description Signed-off-by: Thanawan Atchariyachanvanit * Debug Signed-off-by: Thanawan Atchariyachanvanit --------- Signed-off-by: Thanawan Atchariyachanvanit (cherry picked from commit 20435b18c1b61903eea0cf461cffc8d4b804df60) * Resolve merged conflict Signed-off-by: Thanawan Atchariyachanvanit * Correct linting Signed-off-by: Thanawan Atchariyachanvanit * Correct CHANGELOG.md Signed-off-by: Thanawan Atchariyachanvanit --------- Signed-off-by: Thanawan Atchariyachanvanit Co-authored-by: Dhrubo Saha --- CHANGELOG.md | 2 +- requirements-dev.txt | 3 ++- requirements.txt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5ed36e1..7869858c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Changed - Modify ml-models.JenkinsFile so that it takes model format into account and can be triggered with generic webhook by @thanawan-atc in ([#211](https://github.com/opensearch-project/opensearch-py-ml/pull/211)) +- Bump torch from 1.13.1 to 2.0.1 and add onnx dependency by @thanawan-atc ([#237](https://github.com/opensearch-project/opensearch-py-ml/pull/237)) ### Fixed - Enable make_model_config_json to add model description to model config file by @thanawan-atc in ([#203](https://github.com/opensearch-project/opensearch-py-ml/pull/203)) @@ -33,7 +34,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Search task added @Nurlanprog ([#177](https://github.com/opensearch-project/opensearch-py-ml/pull/177/files)) - adding jupyter notebook based documentation for metrics correlation algorithm by @AlibiZhenis ([#186](https://github.com/opensearch-project/opensearch-py-ml/pull/186)) - ### Changed - Update jenkins file to use updated docker image ([#189](https://github.com/opensearch-project/opensearch-py-ml/pull/189)) - Updated documentation @dhrubo-os ([#98](https://github.com/opensearch-project/opensearch-py-ml/pull/98)) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0f74e77a..b51ae0e2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,8 @@ pandas>=1.5.2,<3 matplotlib>=3.6.2,<4 numpy>=1.24.0,<2 opensearch-py>=2.2.0 -torch==1.13.1 +torch==2.0.1 +onnx accelerate sentence_transformers tqdm diff --git a/requirements.txt b/requirements.txt index 3f0978ab..ab798460 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,8 @@ pandas>=1.5.2,<3 matplotlib>=3.6.2,<4 numpy>=1.24.0,<2 opensearch-py>=2.2.0 -torch==1.13.1 +torch==2.0.1 +onnx accelerate sentence_transformers tqdm