Skip to content

Commit

Permalink
Backport/backport 237 to 1.x (#241)
Browse files Browse the repository at this point in the history
* updating notebook + bumping version (#199)

* updating notebook + bumping version

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

* addressing comments

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

---------

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>
(cherry picked from commit 1237aa6)

* Add description field with make_model_config_json function (#203)

* Add description field

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Restore notebook

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Debug test

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Resolve linting issues

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Debug test_sentencetransformermodel_pytest.py

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Improve test coverage

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Edit test name

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Change CHANGELOG.md & Add comment to sentencetransformermodel.py

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Correct linting

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Improve add description

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Correct linting

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Loosen restriction

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Update sentencetransformermodel.py

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Change function name + Add comment + Add default description

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Debug

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

---------

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>
(cherry picked from commit 20435b1)

* Resolve merged conflict

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Correct linting

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

* Correct CHANGELOG.md

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>

---------

Signed-off-by: Thanawan Atchariyachanvanit <latchari@amazon.com>
Co-authored-by: Dhrubo Saha <dhrubo@amazon.com>
  • Loading branch information
thanawan-atc and dhrubo-os committed Aug 23, 2023
1 parent 8b3114d commit 7d4fd94
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand Down
3 changes: 2 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7d4fd94

Please sign in to comment.