Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add windows support #583

Merged
merged 4 commits into from
Oct 26, 2022
Merged

Add windows support #583

merged 4 commits into from
Oct 26, 2022

Conversation

naveentatikonda
Copy link
Member

Description

Add Windows Support

Issues Resolved

#157

Check List

  • All tests pass
  • New functionality has been documented.
  • Commits are signed as per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@naveentatikonda naveentatikonda requested a review from a team October 17, 2022 22:09
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch 2 times, most recently from a888942 to 78a2b5b Compare October 17, 2022 22:16
heemin32
heemin32 reviewed Oct 17, 2022
View reviewed changes
Copy link
Collaborator

@heemin32 heemin32 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add macos support as well?

@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch from 78a2b5b to a672a28 Compare October 17, 2022 22:26
@naveentatikonda
Copy link
Member Author

can we add macos support as well?

Will create a separate PR for adding mac support.

@codecov-commenter
Copy link

codecov-commenter commented Oct 17, 2022 •
edited
Loading

Codecov Report

Merging #583 (761b99d) into 2.x (9d2bc9d) will increase coverage by 0.87%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                2.x     #583      +/-   ##
============================================
+ Coverage     83.63%   84.51%   +0.87%     
- Complexity     1028     1054      +26     
============================================
  Files           148      149       +1     
  Lines          4235     4301      +66     
  Branches        373      382       +9     
============================================
+ Hits           3542     3635      +93     
+ Misses          517      489      -28     
- Partials        176      177       +1
Impacted Files Coverage Δ
...main/java/org/opensearch/knn/plugin/KNNPlugin.java 100.00% <0.00%> (ø)
...va/org/opensearch/knn/plugin/stats/KNNCounter.java 100.00% <0.00%> (ø)
...rg/opensearch/knn/index/codec/KNNCodecService.java 100.00% <0.00%> (ø)
...earch/knn/index/codec/KNN910Codec/KNN910Codec.java 100.00% <0.00%> (ø)
...earch/knn/index/codec/KNN940Codec/KNN940Codec.java 100.00% <0.00%> (ø)
...rg/opensearch/knn/index/codec/KNNCodecFactory.java
...g/opensearch/knn/index/codec/KNNFormatFactory.java
.../knn/index/codec/BasePerFieldKnnVectorsFormat.java 58.33% <0.00%> (ø)
.../java/org/opensearch/knn/index/KNNClusterUtil.java 100.00% <0.00%> (ø)
...rg/opensearch/knn/index/codec/KNNCodecVersion.java 80.76% <0.00%> (ø)
... and 7 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@jmazanec15
Copy link
Member

Is there any way to download libopenblas.dll as opposed to shipping it in the repo?

jmazanec15
jmazanec15 reviewed Oct 17, 2022
View reviewed changes
build.gradle Outdated Show resolved Hide resolved
build-tools/knnplugin-coverage.gradle Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
patches/CMakeLists.patch Outdated Show resolved Hide resolved
patches/CMakeLists.patch Outdated Show resolved Hide resolved
scripts/windowsScript.sh Outdated Show resolved Hide resolved
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch 2 times, most recently from 3b5e977 to ab00b22 Compare October 24, 2022 16:48
@naveentatikonda
Add Windows Support
ccb8149 
Signed-off-by: Naveen <navtat@amazon.com>
@naveentatikonda
Add license for libwinpthread and copy all licenses to LICENSE.txt
9e5baec 
Signed-off-by: Naveen <navtat@amazon.com>
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch from ab00b22 to 9e5baec Compare October 24, 2022 17:27
@naveentatikonda
Download OpenBLAS
a83e2c0 
Signed-off-by: Naveen <navtat@amazon.com>
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch from c593391 to a83e2c0 Compare October 25, 2022 00:23
jmazanec15
jmazanec15 reviewed Oct 25, 2022
View reviewed changes
scripts/windowsScript.ps1 Outdated Show resolved Hide resolved
scripts/windowsScript.ps1 Show resolved Hide resolved
patches/windows/CMakeLists.patch Outdated Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
@peterzhuamazon peterzhuamazon mentioned this pull request Oct 26, 2022
Merged
5 tasks
@peterzhuamazon
Copy link
Member

peterzhuamazon commented Oct 26, 2022 •
edited
Loading

Hi @naveentatikonda @jmazanec15

I assume this needs to be port to main as 3.x will also support windows?

Also here is my PR that adds new changes to build.sh.

It is based on the branch of this PR from @naveentatikonda so it is easier to test.
PR #595 should be merged after #583 merged.

Thanks.

@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch 2 times, most recently from 64e038b to 42d75da Compare October 26, 2022 17:04
jmazanec15
jmazanec15 previously approved these changes Oct 26, 2022
View reviewed changes
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch from 42d75da to 761b99d Compare October 26, 2022 20:38
jmazanec15
jmazanec15 previously approved these changes Oct 26, 2022
View reviewed changes
@naveentatikonda naveentatikonda added 2.4.0 Enhancements Increases software capabilities beyond original client specifications windows labels Oct 26, 2022
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch from 761b99d to cb51222 Compare October 26, 2022 22:01
@naveentatikonda
Remove Git Patch and add branching logic for CMakeLists.txt
4a98708 
Signed-off-by: Naveen <navtat@amazon.com>
@naveentatikonda naveentatikonda force-pushed the add_windows_support_2.x branch from cb51222 to 4a98708 Compare October 26, 2022 23:01
@naveentatikonda naveentatikonda merged commit 515dcdb into opensearch-project:2.x Oct 26, 2022
@peterzhuamazon peterzhuamazon deleted the add_windows_support_2.x branch October 27, 2022 00:35
naveentatikonda added a commit to naveentatikonda/k-NN that referenced this pull request Oct 27, 2022
@naveentatikonda
Add windows support (opensearch-project#583)
18403ff 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>
naveentatikonda added a commit that referenced this pull request Oct 28, 2022
@naveentatikonda
Add windows support (#583) (#599)
fddfe19 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>
@heemin32 heemin32 added v2.4.0 'Issues and PRs related to version v2.4.0' and removed 2.4.0 labels Nov 2, 2022
naveentatikonda added a commit to naveentatikonda/k-NN that referenced this pull request Dec 2, 2022
@naveentatikonda
Add windows support (opensearch-project#583)
6f08997 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>
naveentatikonda added a commit to naveentatikonda/k-NN that referenced this pull request Dec 2, 2022
@naveentatikonda
Add windows support (opensearch-project#583)
6b44bb8 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>
naveentatikonda added a commit that referenced this pull request Dec 2, 2022
@naveentatikonda
Add windows support (#583) (#642)
4b9245e 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>
naveentatikonda added a commit to naveentatikonda/k-NN that referenced this pull request Dec 2, 2022
@naveentatikonda
Add windows support (opensearch-project#583)
2b04faf 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>
naveentatikonda added a commit that referenced this pull request Dec 3, 2022
@naveentatikonda
Add windows support (#583) (#644)
bcce85d 
* Add Windows Support

Signed-off-by: Naveen <navtat@amazon.com>

* Add license for libwinpthread and copy all licenses to LICENSE.txt

Signed-off-by: Naveen <navtat@amazon.com>

* Download OpenBLAS

Signed-off-by: Naveen <navtat@amazon.com>

* Remove Git Patch and add branching logic for CMakeLists.txt

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>

Signed-off-by: Naveen <navtat@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterzhuamazon peterzhuamazon peterzhuamazon approved these changes

@jmazanec15 jmazanec15 jmazanec15 approved these changes

@heemin32 heemin32 Awaiting requested review from heemin32 heemin32 is a code owner

Assignees
No one assigned
Labels
Enhancements Increases software capabilities beyond original client specifications v2.4.0 'Issues and PRs related to version v2.4.0' windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@naveentatikonda @codecov-commenter @jmazanec15 @peterzhuamazon @heemin32