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

Merge master into 2.1. Fix merge issues #1191

Merged
merged 4 commits into from
Jul 26, 2022
Merged

Merge master into 2.1. Fix merge issues #1191

merged 4 commits into from
Jul 26, 2022

Conversation

pgmpablo157321
Copy link
Contributor

#1187 had mergeability issues and had issues with manual merge due to the branch being protected

@github-actions
Copy link

github-actions bot commented Jul 26, 2022 •
edited
Loading

MLCommons CLA bot All contributors have signed the MLCommons CLA ✍️ ✅

morphine00 and others added 4 commits July 25, 2022 20:16
@morphine00 @pgmpablo157321
Update CLA bot (mlcommons#1180)
d92eff7
@georgelyuan @pgmpablo157321
removing obselete audit directory (mlcommons#1188)
4f94421
@nv-jinhosuh @rnaidu02 @pgmpablo157321
[Loadgen for LON] making non-const function for sut->Name() call (mlc…
24908ff 
…ommons#1184)

* [Loadgen for LON] making non-const function for sut->Name() call

sut->Name() call requiires dynamic behavior through QDL in LON.

* Removing const from SUT Name()

* Removing const from Name() - missed ones

Co-authored-by: rameshchukka <rnaidu02@yahoo.com>
@arjunsuresh @rnaidu02 @pgmpablo157321
Update run_local.sh (mlcommons#1181)
26123c2 
Using python3 is easier here as python2 is not used anymore and python command gives error on macOS

Co-authored-by: rameshchukka <rnaidu02@yahoo.com>
@pgmpablo157321 pgmpablo157321 changed the title Merge master into 2.1 Merge master into 2.1. Fix merge issues Jul 26, 2022
@lgtm-com
Copy link

lgtm-com bot commented Jul 26, 2022

This pull request fixes 12 alerts when merging 26123c2 into 67eb6a0 - view on LGTM.com

fixed alerts:

  • 9 for Unused import
  • 2 for Duplicate key in dict literal
  • 1 for Unused local variable

@pgmpablo157321 pgmpablo157321 requested a review from rnaidu02 July 26, 2022 01:39
@pgmpablo157321
Copy link
Contributor Author

Same changes as in #1187 with the exception of the update of the calibration dataset. That was already done in #1172

@rnaidu02 rnaidu02 merged commit bc405a2 into mlcommons:r2.1 Jul 26, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Jul 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rnaidu02 rnaidu02 rnaidu02 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pgmpablo157321 @rnaidu02 @morphine00 @georgelyuan @nv-jinhosuh @arjunsuresh