[Catalog] Remove hardcoded A2 pricing URL & Fix a bug in A2 machine zones #1426
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Michaelvll
reviewed
Nov 17, 2022
There was a problem hiding this comment.
Thanks for the quick fix @WoosukKwon! When I am trying to run python -m sky.clouds.service_catalog.data_fetchers.fetch_gcp --all-regions with this branch, I got the following error:
requests.exceptions.ConnectionError: HTTPSConnectionPool(host='cloud.google.comhttps', port=443): Max retries exceeded with url: //cloud.google.com/frame/compute/gpus-pricing_8e5c7f0d655c14f031aa9a5030fda1292496ad4d114b8c8543a953bd20408d69.frame (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7fd4a52a4cd0>: Failed to establish a new connection: [Errno -2] Name or service not known'))
|
@Michaelvll Thanks for reporting the bug. It's weird. It did work when I submitted the PR. 😢 It seems like very recently there was a slight change in the GCP websites. Previously, the iframe URLs didn't include |
Michaelvll
approved these changes
Nov 19, 2022
There was a problem hiding this comment.
Thank you for quickly identifying the issue and fixing it @WoosukKwon! LGTM! Just tested with python -m sky.clouds.service_catalog.data_fetchers.fetch_gcp --all-regions, it works smoothly.
| 'MachineType': 'A2', | ||
| }) | ||
| vm_zones = pd.concat([vm_zones, df], ignore_index=True) | ||
| vm_zones = vm_zones.drop_duplicates() |
There was a problem hiding this comment.
Just curious, when will the duplication happen?
There was a problem hiding this comment.
Good question.
a100_zones include all zones with A100 GPUs.
vm_zones include all A100 zones except us-west1-b (due to the error in the GCP website).
When we merge them, all A100 zones except us-west1-b will be duplicated.
So we remove the duplicates here.
There was a problem hiding this comment.
Thanks for the explanation! It would be nice to have that explanation in the comment before this line.
Also, can we have an assert that for each (instance_type, zone) pair there is only one entry, to avoid any inconsistency of the price between the two source?
There was a problem hiding this comment.
I added it, but I'm not sure if I correctly understand what you meant here. Please check.
There was a problem hiding this comment.
Thanks for the update! The comment makes sense. I was trying to say if we can add a line below:
assert not any(vm_zones.duplicated(['MachineType', 'AvailabilityZone]))
There was a problem hiding this comment.
Got it. Then I think I already added the same check in L305:
# Check duplicates.
assert not vm_df[['InstanceType', 'AvailabilityZone']].duplicated().any()
Michaelvll
reviewed
Nov 21, 2022
| 'MachineType': 'A2', | ||
| }) | ||
| vm_zones = pd.concat([vm_zones, df], ignore_index=True) | ||
| vm_zones = vm_zones.drop_duplicates() |
There was a problem hiding this comment.
Thanks for the update! The comment makes sense. I was trying to say if we can add a line below:
assert not any(vm_zones.duplicated(['MachineType', 'AvailabilityZone]))
Michaelvll
approved these changes
Nov 21, 2022
concretevitamin
pushed a commit
that referenced
this pull request
Dec 1, 2022
…ones (#1426) * Update no 16xA100-40GB zones * [Catalog] Remove GCP A2 price URL & Fix GCP A100 zone issues * Add more type annotations * Minor * yapf * Do not add GCP URL prefix * Minor * Address comments * Address comment1 * Minor * Add comments about the case when a100.empty is True * Assert not duplicated
sumanthgenz
pushed a commit
to sumanthgenz/skypilot
that referenced
this pull request
Jan 15, 2023
…ones (skypilot-org#1426) * Update no 16xA100-40GB zones * [Catalog] Remove GCP A2 price URL & Fix GCP A100 zone issues * Add more type annotations * Minor * yapf * Do not add GCP URL prefix * Minor * Address comments * Address comment1 * Minor * Add comments about the case when a100.empty is True * Assert not duplicated
Michaelvll
added a commit
that referenced
this pull request
Jan 18, 2023
* add cost tracking for clusters that handles launching, re-starting, getting status, stopping and downing clusters, but no auto-stopping * address Romil PR comments * address Zhanghao PR comments * fix nit * address more PR comments * address last wave of PR comments * sky * address fixing argument for requested resources and fixing spot tests for CI * address more PR comments * make tests resources a list to prevent errors * fix tests again * address PR comments, including adding fetchall to fix status one cluster only bug * fix PR comments * change progress bar interference on stop/down * add sky report instead of showing cost on other commands * address cost report PR comments * address more PR comments on sky report * [Core] Port ray 2.0.1 (#1133) * update ray node provider to 2.0.0 update patches Adapt to ray functions in 2.0.0 update azure-cli version for faster installation format [Onprem] Automatically install sky dependencies (#1116) * Remove root user, move ray cluster to admin * Automatically install sky dependencies * Fix admin alignment * Fix PR * Address romil's comments * F * Addressed Romil's comments Add `--retry-until-up`, `--region`, `--zone`, and `--idle-minutes-to-autostop` for interactive nodes (#1207) * Add --retry-until-up flag for interactive nodes * Add --region flag for interactive nodes * Add --idle-minutes-to-autostop flag for interactive nodes * Add --zone flag for interactive nodes * Update help messages * Address nit Add all region option in catalog fetcher and speed up azure fetcher (#1204) * Port changes * format * add t2a exclusion back * fix A100 for GCP * fix aws fetching for p4de.24xlarge * Fill GPUInfo * fix * address part of comments * address comments * add test for A100 * patch GpuInfo * Add generation info * Add capabilities back to azure and fix aws * fix azure catalog * format * lint * remove zone from azure * fix azure * Add analyze for csv * update catalog analysis * format * backward compatible for azure_catalog * yapf * fix GCP catalog * fix A100-80GB * format * increase version number * only keep useful columns for aws * remove capabilities from azure * add az to AWS Revert "Add `--retry-until-up`, `--region`, `--zone`, and `--idle-minutes-to-autostop` for interactive nodes" (#1220) Revert "Add `--retry-until-up`, `--region`, `--zone`, and `--idle-minutes-to-autostop` for interactive nodes (#1207)" This reverts commit f06416d. [Storage] Add `StorageMode` to __init__ (#1223) * Add storage mode to __init__ * fix [Example] Minimal containerized app example (#1212) * Container example * parenthesis * Add explicit StorageMode * lint Fix Mac Version in Setup.py (#1224) Fix mac Reduce iops for aws instances (#1221) * set the default iops to be same as console for AWS * fix Revert "Reduce iops for aws instances" (#1229) Revert "Reduce iops for aws instances (#1221)" This reverts commit 29f1458. update back compat test * parent 06afd93 author Zhanghao Wu <zhanghao.wu@outlook.com> 1665364265 -0700 committer Zhanghao Wu <zhanghao.wu@outlook.com> 1665899898 -0700 parent 06afd93 author Zhanghao Wu <zhanghao.wu@outlook.com> 1665364265 -0700 committer Zhanghao Wu <zhanghao.wu@outlook.com> 1665899681 -0700 Support for autodown Change API to terminate fix flag address comment format Rename terminate to down add smoke test format fix syntax use gcp for autodown test fix smoke test fix smoke test address comments Switch back to terminate Change back to tear down Change to tear down fix comment * Fix rebase issue * address comments * address * fix setup.py * upgrade to 2.0.1 * Fix docs for ray version * Fix example * fix backward compatibility test * Fix onprem job submission * add steps for backward compat test * docs: Remove version from docs html titles. (#1303) Remove version from docs html titles. * Fix unnecessary ssh hanging issue on Ray (#851) * Fix ray hanging ssh issue * Fix * change the order back * Update node status after first attempt * Set `--rename-dir-limit` for gcsfuse to allow dir renames (#1296) Set rename_dir_lim for gcsfuse * Docs: polish `sky.Task` doc strings. (#1302) * WIP * Polish sky.Task doc strings. * docs: expose Task (a subset of methods); hide Dag. * Tweak Task method order; in docs display methods by source order. * CLI docs: tweak order; tweak `spot launch`. * Address comments. * Code block formatting. * [Launch/Backward Compatibility] Fix incorrect Ray YAML issue (#1287) * Fix incorrect Ray YAML issue * yapf * fix * comments * [Storage] add `--implicit-dirs` for gcsfuse (#1312) add --implicit-dirs * Improving README. (#1308) * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Port landing paras to docs index.rst. * [UX] Disable python output buffer by default (#1290) diable python output buffer * [Storage][Filemounts] Set relative dir root to workdir (#1315) Set relative dir root to workdir for file_mounts * Fix Sky Storage Delete more than 256 Items/folders + Bulk Deletion Tests (#1285) * fix * Add romil's suggestions * Add bulk deletion tests * ok * Fix * [Storage] Add lazy unmount flag (#1320) Add lazy unmount flag * [Core] Fix skylet checking (#1325) * Fix skylet checking * exclude grep * [UX] remove stacktrace for pipe and ssh info (#1324) * UX: remove stacktrace for pipe and ssh info * Add comment * Avoid ray output in the logs * format * revert ssh quiet option * [Dependency] Fix colorama dependency issue with awscli (#1323) * Fix colorama dependency issue with awscli * fix ux for storage delete * Add roadmap. (#1317) * Add roadmap. * Update ROADMAP.md * Fix SKY_NODE_RANK environment variable (#1291) * Add flag for retrieving internal node ips * Ensure SKY_NODE_RANK is 0 for head and stable * Clearer comment for get_internal_ips * Handle different num nodes correctly * Address PR comments * Address nits * [Spot] Fix race condition for spot logs (#1329) * Fix race condition for spot logs * fix * fix comment * address comments * add comment * Add TPU Pod to doc (#1318) * add pod to doc * Apply suggestions from code review Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * comments * comments * update bucket note * Apply suggestions from code review Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * update * update * fix * fix * comments * fix Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * [UX] Add environment variable `SKY_NUM_GPUS_PER_NODE` (#1337) * add SKY_NUM_GPUS_PER_NODE * increase multi-node progress timeout * pin torch version * add comment * address comment * fix smoke test * address comments * [Image] Fix blocking by unattended-upgrade (#1347) * Fix blocking by unattended-upgrade * adopt to gcp and azure * [Test/Azure] Fix the torch version in examples for smoke test and change the credential for Azure (#1330) * Upgrade images for three clouds * Fix cuda version * pin cuda version for torch * Fix torch version * fix comments * Fix azure provider * fix credential * revert back to previous azure image * switch back to cuda 11.3 for pytorch due to azure's image * fix torch installation * increase the multi-node timeout * Update sky/clouds/azure.py Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * revert aws image version * pin cu113 for huggingface * Add comment * format * Update sky/clouds/aws.py Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * Update sky/clouds/gcp.py Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * revert gcp image * Fix doc Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * [Docs] Reorganizing docs. (#1316) * Reorganizing docs. * V2. * Reorg + rewording * Address comments * Remove 'convenient' * Update `SKY_NODE_RANK` docs (#1350) * Add tip for node rank to docs * Update formatting * Indent fix. Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * Add `--retry-until-up`, `--region`, `--zone`, and `--idle-minutes-to-autostop` for interactive nodes (v2) (#1297) * Add --region, --zone, --idle-minutes-to-autostop, and --retry-until-up for interactive nodes * Update user_requested_resources * Add --down for interactive nodes and refactor auto{stop,down} edge case * Refactor click options * Revert "Refactor click options" This reverts commit 10a06a9. * Fix TPU Pod (#1358) * fix pod * yapf * Minor fix for yapf warnings (#1362) * [Docs] Clarify Storage mounting details (#1365) * fix incorrect statements * fix incorrect statements * fix incorrect statements * Fix bugs in GCP A100 prices (#1368) * Fix GCP A100 price bugs * yapf * [Custom Image] Support tag for the images and global regions (#1366) * Support image tag for AWS * add gcp image support * address comments * fix * remove pandas warning * Add example for using ubuntu1804 * add ubuntu 1804 in the test * Enforce trying us regions first * format * address comments * address comments * Add docs and rename methods * Add fetch global regions for GCP * Add all regions for Azure * rename and add doc * remvoe accidently added folder * fix service_catalog * remove extra line * Address comments * mkdir for catalog path * increase waiting time in test * fix test recovery * format * [UX/Doc] Add disk size in resource display and a minor fix for the doc (#1371) Minor fix for docs and ux * [Onprem] Support for Different Type of GPUs + Small Bugfix (#1356) * Ok * Great suggestion from Zhanghao * fix * Update tutorial.rst * Pin `torch` in various examples to avoid cuda version issues. (#1378) * tutorial.rst: pin `torch` to avoid version issues. Tested: - Ran on both AWS and GCP. * Fixes two more yamls * [Env] SKYPILOT_JOB_ID for all tasks (#1377) * Add run id for normal job * add example for the run id * fix env_check * fix env_check * fix * address comments * Rename to SKYPILOT_JOB_ID * rename the controller's job id to avoid confusion * rename env variables * fix * [Core] Add support for detach setup (#1379) * Add support for async setup * Fix logging * Add test for async setup * add parens * fix * refactor a bit * Fix status * fix smoke test * rename * fix is_cluster_idle function * format * address comments * fix * Add setup failed * Fix failed setup * Add comment * Add comments * format * fix logs * format * address comments * Minor UX fix: `sky cancel` should not print stacktraces. (#1385) * Minor UX fix: `sky cancel` should not print stacktraces. * Wording fix. * exit 1 * [UX] Disable ssh connection sharing for setup (#1390) * Disable ssh connection sharing for setup * format * remove redundant * fix type hint * Docs: multi-node clarifications, and ssh into workers. (#1363) * Fixes #1338: add docs on logging into workers. * Fixes #1340 and fixes #1339. * Address comments * Reword. * Hint. * Fix Logging for `sky launch` on new machine (#1382) * ok * ok * Ok * ok * Unify methods * ok * fix * [Image] Support passing AMIs for different regions (#1384) * image dict in resources * fix * fix * add tests * add per region example * address comments * Fix checking * fix * fix smoke test * [LocalDockerBackend] Update `is_local_cluster` check for docker backend (#1396) Update is_local_cluster check for LocalDockerBackend * [Setup] unset CUDA_VISIBLE_DEVICES for detach setup (#1404) * unset CUDA_VISIBLE_DEVICES * add env check example * Add setting CUDA_VISIBLE_DEVICES test * fix * Update sky/backends/cloud_vm_ray_backend.py Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * format Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * [Spot] Keep SKYPILOT_JOB_ID the same for the same spot job (#1400) * fix SKYPILOT_JOB_ID * Fix test * fix * format * Add SKYPILOT_JOB_ID to sky spot queue * nit * don't set job_id_env_var for spot controller task * address comments * Revert SKYPILOT_JOB_ID in spot queue * format * Change default value of task.envs to dict * [UX] fix the error for the first time `sky launch` (#1405) * fix ux * test * fix no public cloud * address comments * Fix logging * format * Remove the error type for CLI * yellow * fix * Fix logging * [Spot] Fix spot recovery for multi node (#1411) * Add cluster status check even job is RUNNING for multi-node * Disable autoscaler logs and fix finished when partially preempted * format * Add test * address comments * update * Add time * [Release] Fix pypi description (#1416) * Fix pypi description * fix * format * [Bug fix] head_ip extraction from Ray stdout (#1421) * Fix bug in head_ip extraction from Ray stdout after launching cluster by using regex to exactly match ip. * Remove unneeded comment. * Update sky/backends/cloud_vm_ray_backend.py Co-authored-by: Zhanghao Wu <zhanghao.wu@outlook.com> * Run yapf and pylint Co-authored-by: Zhanghao Wu <zhanghao.wu@outlook.com> * [Global Regions] Add data fetchers into wheel (#1406) * Add data fetchers into wheel * yapf * Fix gcp fetcher * Add check * exclude analyze.py * Link to blog on README and docs. (#1430) * [Spot] Let cancel interrupt the spot job (#1414) * Let cancel interrupt the job * Add test * Fix test * Cancel early * fix test * fix test * Fix exceptions * pass test * increase waiting time * address comments * add job id * remove 'auto' in ray.init * Revert "[Spot] Let cancel interrupt the spot job" (#1432) Revert "[Spot] Let cancel interrupt the spot job (#1414)" This reverts commit 3bbf4aa. * [AWS] Avoid key pair permission issue by using cloud-init for authorized keys (#1427) * Switch to UserData to add public key for AWS * fix * Avoid hardcoding username * Fix backward compatibility test * address comments * address comments * Minor spot logs fix: don't print job id not provided on spot launch. (#1434) Minor spot logs fix: don't print job id not provided. * [Catalog] Remove hardcoded A2 pricing URL & Fix a bug in A2 machine zones (#1426) * Update no 16xA100-40GB zones * [Catalog] Remove GCP A2 price URL & Fix GCP A100 zone issues * Add more type annotations * Minor * yapf * Do not add GCP URL prefix * Minor * Address comments * Address comment1 * Minor * Add comments about the case when a100.empty is True * Assert not duplicated * [Spot] Let cancel interrupt the spot job (#1414) (#1433) * Let cancel interrupt the job * Add test * Fix test * Cancel early * fix test * fix test * Fix exceptions * pass test * increase waiting time * address comments * add job id * remove 'auto' in ray.init * Fix serialization problem * refactor a bit * Fix * Add comments * format * pylint * revert a format change * Add docstr * Move ray.init * replace ray with multiprocess.Process * Add test for setup cancelation * Fix logging * Fix test * lint * Use SIGTERM instead * format * Change exception type * revert to KeyboardInterrupt * remove * Fix test * fix test * fix test * typo * [Usage] Robustify the user hash to avoid empty string (#1442) * Robustify the user hash to avoid empty string * fix * Check valid user hash with hexdecimal * format * fix * Add fallback * Add comment * lint * [Storage] Support multiple files in Storage (#1311) * Set rename_dir_lim for gcsfuse * Add support for list of sources for Storage * fix demo yaml * tests * lint * lint * test * add validation * address zhwu comments * add error on basename conflicts * use gsutil cp -n instead of gsutil rsync * lint * fix name * parallelize gsutil rsync * parallelize aws s3 rsync * lint * address comments * refactor * lint * address comments * update schema * Logging fixes. (#1452) * Logging fixes. * yapf * sys.exit(1) * [Storage] Fix copy monuts for file with s3 bucket url (#1457) * test file download with s3 * fix test * fix storage file mounts * format * remove mkdir for `make_sync_dir_command` * Print errors for GCP timeout. (#1454) * [autostop] Support restarting the autostop timer. (#1458) * [autostop] Support restarting the autostop timer. * Logging * Make each job submission call set_active_time_to_now(). * Fix test and pylint. * Fix comments. * Change tests; some fixes * logging remnant * remnant * [Spot] Make sure the cluster status is not None when showing (#1464) * Make sure the cluster status is not None when showing * Fix another potential issue with NoneType of handle * Add assert * fix * format * Address comments * Address comments * format * format * fix * fix * fix spot cancellation * format * Add a few small warnings to README and CONTRIBUTING. (#1422) * Add a couple small warnings to README and CONTRIBUTING. * Update README.md Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> * Hotfix for spot TPU pod recovery (#1470) * hotfix * comment * [Spot] Better spot logs (#1412) * Add cluster status check even job is RUNNING for multi-node * Disable autoscaler logs and fix finished when partially preempted * format * Add test * Better spot logging * Add logs * format * address comments * address comments part 2 * Finish the logging early * format * better logging * Address comments * Fix message * Address comments * Improve UX for logs to include SSH name and rank (#1380) * Messy WIP * Fixes two more yamls * Improve log UX and ensure stableness * Remove print statement * Remove task name from logs * Fix name for single-node tasks * Update var names and comments for clarity * Update logic for single and multi-node clusters * Cache stable cluster IP list in ResourceHandle * Properly cache and invalidate stable list * Add back SKYPILOT_NODE_IPS * Update log file name * Refactor backend to use cached stable IP list * Fix spot test * Fix formatting * Refactor ResourceHandle * Fixes for correctness * Remove unneeded num_nodes arg * Fix _gang_schedule_ray_up * Ensure stable IP list is cached * Formatting fixes * Refactor updating stable IPs to be part of handle * Merge max attempts constant * Fix ordering for setting TPU name * Fix bugs and clean up code * Fix backwards compatibility * Fix bug with old autostopped clusters * Fix comment * Fix assertion statement * Update assertion message Co-authored-by: Zhanghao Wu <zhanghao.wu@outlook.com> * Fix linting * Fix retrieving IPs for TPU vm * Add optimization for updating IPs * Linting fix * Update comment Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> Co-authored-by: Zhanghao Wu <zhanghao.wu@outlook.com> * add cost tracking for clusters that handles launching, re-starting, getting status, stopping and downing clusters, but no auto-stopping * fix some artifacts from rebase error * handle linting * make it cost-report * address PR changes for approval * last changes * address last changes * move around comments for sort * add cost_report func to init.all list Co-authored-by: Sumanth <sumanth@MacBook-Pro-5.local> Co-authored-by: Sumanth <sumanth@MacBook-Pro-5.attlocal.net> Co-authored-by: Zhanghao Wu <zhanghao.wu@outlook.com> Co-authored-by: Zongheng Yang <zongheng.y@gmail.com> Co-authored-by: Wei-Lin Chiang <infwinston@gmail.com> Co-authored-by: Romil Bhardwaj <romil.bhardwaj@gmail.com> Co-authored-by: Michael Luo <michael.luo@berkeley.edu> Co-authored-by: Isaac Ong <isaacong.jw@gmail.com> Co-authored-by: ewzeng <46831164+ewzeng@users.noreply.github.com> Co-authored-by: Woosuk Kwon <woosuk.kwon@berkeley.edu> Co-authored-by: Donny Greenberg <dongreenberg2@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes the hardcoded URL we use for fetching A2 machine prices. Instead of directly getting A2 machine prices, we first obtain A2 machine "total" cost, which is A2 host VM price + A100 GPU price, from the GCP website (https://cloud.google.com/compute/vm-instance-pricing). Then we get the true A2 host machine price by deducting the A100 (or A100-80GB) GPU price from the total cost.
This PR also fixes a bug that our current GCP catalog does not contain the A2 machines in
us-west1-b. This bug happens because https://cloud.google.com/compute/docs/regions-zones is not correct.