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.

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

Only check the gcc version ceiling when it is on linux #991

Merged

Conversation

peterzhuamazon
Copy link
Member

Description

Only check the gcc version ceiling when it is on linux

Issues Resolved

#975

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

@@ -119,7 +119,7 @@ fi
# https://github.com/opensearch-project/k-NN/issues/975
GCC_REQUIRED_VERSION_CEILING=8.0.0
COMPARE_VERSION_CEILING=`echo $GCC_REQUIRED_VERSION_CEILING $GCC_VERSION | tr ' ' '\n' | sort -V | uniq | tail -n 1`
if [ ! "$COMPARE_VERSION_CEILING" = "$GCC_REQUIRED_VERSION_CEILING" ]; then
if [ "$COMPARE_VERSION_CEILING" != "$GCC_REQUIRED_VERSION_CEILING" ] && (echo "$OSTYPE" | grep -i linux); then
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we use "$PLATFORM" from top instead ?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is temp code specifically for centos7 before we move to rockylinux8.
Both the x64 and the arm64 centos7 image is built based on the same dockerfile thus have same gcc version.
As long as linux is specifically locked to version above 4.9 and lower than 8 we are good.

@codecov
Copy link

codecov bot commented Jul 14, 2023

Codecov Report

Merging #991 (53b1998) into main (afdf125) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #991   +/-   ##
=========================================
  Coverage     85.13%   85.13%           
  Complexity     1141     1141           
=========================================
  Files           154      154           
  Lines          4683     4683           
  Branches        423      423           
=========================================
  Hits           3987     3987           
  Misses          504      504           
  Partials        192      192           

@navneet1v navneet1v merged commit 0801408 into opensearch-project:main Jul 14, 2023
27 of 66 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 14, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 14, 2023
@peterzhuamazon peterzhuamazon deleted the knn-verification-windows branch July 14, 2023 02:56
navneet1v pushed a commit that referenced this pull request Jul 14, 2023
Signed-off-by: Peter Zhu <[email protected]>
(cherry picked from commit 0801408)

Co-authored-by: Peter Zhu <[email protected]>
peterzhuamazon added a commit that referenced this pull request Jul 14, 2023
Signed-off-by: Peter Zhu <[email protected]>
(cherry picked from commit 0801408)

Co-authored-by: Peter Zhu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

3 participants