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

add deploySetting in registering local models #2415

Merged
merged 1 commit into from
May 8, 2024

Conversation

Zhangxunmt
Copy link
Collaborator

@Zhangxunmt Zhangxunmt commented May 8, 2024

Description

DeploySetting was not included in registering local models (pre-trained or from custom url), which was fine because it only included autoDeploy flag for remote models. Now we added TTL in the DeploySetting which applies to all models so We need to add it back.

Verified in local dev cluster.

Issues Resolved

[List any issues this PR will resolve]

Check List

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

@ylwu-amzn
Copy link
Collaborator

From the description

DeploySetting was not included in registering pre-trained models, which was fine because it only included autoDeploy flag for remote models.

The code fix seems not just for pre-trained model. Seems we are fixing for all local models, right?

@Zhangxunmt
Copy link
Collaborator Author

Zhangxunmt commented May 8, 2024

From the description

DeploySetting was not included in registering pre-trained models, which was fine because it only included autoDeploy flag for remote models.

The code fix seems not just for pre-trained model. Seems we are fixing for all local models, right?

Yes it should be for all models. I just verified with registering model from url and it applies to that case too.

@ylwu-amzn
Copy link
Collaborator

From the description

DeploySetting was not included in registering pre-trained models, which was fine because it only included autoDeploy flag for remote models.

The code fix seems not just for pre-trained model. Seems we are fixing for all local models, right?

Yes it should be for all models.

Got it, you can update the description to make it accurate

@Zhangxunmt Zhangxunmt changed the title add deploySetting in registering pretrained models add deploySetting in registering local models May 8, 2024
@dhrubo-os
Copy link
Collaborator

From the description

DeploySetting was not included in registering pre-trained models, which was fine because it only included autoDeploy flag for remote models.

The code fix seems not just for pre-trained model. Seems we are fixing for all local models, right?

Yes it should be for all models. I just verified with registering model from url and it applies to that case too.

What about pre-trained models? What happens for those models? How can we add deploy settings to those models? Do we need to update the documentation as well for pre-trained models?

@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 04:29 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 04:29 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 04:29 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 04:29 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 04:29 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 04:29 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 08:46 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 08:46 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 8, 2024 08:46 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 08:46 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 08:46 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 08:46 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 09:40 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 09:40 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 8, 2024 09:40 — with GitHub Actions Inactive
@ylwu-amzn ylwu-amzn merged commit 9478fd4 into opensearch-project:main May 8, 2024
13 of 16 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2415-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9478fd4db292a8657c6dd13005c5a8beb8bc7d6a
# Push it to GitHub
git push --set-upstream origin backport/backport-2415-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2415-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.14 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.14 2.14
# Navigate to the new working tree
cd .worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-2415-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9478fd4db292a8657c6dd13005c5a8beb8bc7d6a
# Push it to GitHub
git push --set-upstream origin backport/backport-2415-to-2.14
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.14

Then, create a pull request where the base branch is 2.14 and the compare/head branch is backport/backport-2415-to-2.14.

Zhangxunmt added a commit to Zhangxunmt/ml-commons that referenced this pull request May 8, 2024
Zhangxunmt added a commit to Zhangxunmt/ml-commons that referenced this pull request May 8, 2024
Zhangxunmt added a commit to Zhangxunmt/ml-commons that referenced this pull request May 8, 2024
Zhangxunmt added a commit to Zhangxunmt/ml-commons that referenced this pull request May 8, 2024
Zhangxunmt added a commit that referenced this pull request May 8, 2024
Zhangxunmt added a commit that referenced this pull request May 8, 2024
dhrubo-os pushed a commit to dhrubo-os/ml-commons that referenced this pull request May 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants