squashed commits

skypilot-org · Dec 3, 2021 · d24baa8 · d24baa8
1 parent a35a830
commit d24baa8
Show file tree

Hide file tree

Showing 62 changed files with 992 additions and 1,163 deletions.
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -1,8 +1,15 @@
 name: Pylint
 
 on:
-  - pull_request
-
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
 jobs:
   pylint:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@ plotting/*.pdf
 plotting/*.png
 
 prototype/**/*.yml
-prototype/config/*.sh
+prototype/config/**/*.sh
 prototype/*.egg-info/
 prototype/**/*.tmp
 

diff --git a/.pylintrc b/.pylintrc
@@ -85,6 +85,8 @@ disable=abstract-method,
         intern-builtin,
         invalid-str-codec,
         locally-disabled,
+        logging-format-interpolation,  # FIXME(sky): make pass.
+        logging-fstring-interpolation,  # FIXME(sky): make pass.
         long-builtin,
         long-suffix,
         map-builtin-not-iterating,

diff --git a/prototype/README.md b/prototype/README.md
@@ -5,6 +5,7 @@
 ## Setup
 
 ```bash
+pip install -r requirements.txt
 pip install -e .
 
 python examples/resnet_app.py

diff --git a/prototype/cli/cli.py b/prototype/cli/cli.py
@@ -163,15 +163,17 @@ def run(entry_point, cluster, dryrun):
     with sky.Dag() as dag:
         task = sky.Task.from_yaml(entry_point)
 
-    # TODO: This is sketchy. What if we're reusing a cluster and the optimized plan is different?
-    dag = sky.optimize(dag, minimize=sky.Optimizer.COST)
-
     handle = None
     if cluster is not None:
         new_task = dag.tasks[0]
         handle = _reuse_or_provision_cluster(new_task, cluster)
 
-    sky.execute(dag, dryrun=dryrun, handle=handle, stream_logs=stream_logs)
+    # TODO: This is sketchy. What if we're reusing a cluster and the optimized plan is different?
+    sky.execute(dag,
+                dryrun=dryrun,
+                handle=handle,
+                stream_logs=stream_logs,
+                optimize_target=sky.OptimizeTarget.COST)
 
 
 @cli.command()

diff --git a/prototype/config/aws-distributed.yml.j2 b/prototype/config/aws-distributed.yml.j2
diff --git a/prototype/config/aws.yml.j2 b/prototype/config/aws.yml.j2
diff --git a/prototype/config/azure.yml.j2 b/prototype/config/azure.yml.j2
diff --git a/prototype/config/gcp.yml.j2 b/prototype/config/gcp.yml.j2
diff --git a/prototype/examples/containerized_app.py b/prototype/examples/containerized_app.py
@@ -24,5 +24,4 @@
     t = sky.Task(run=run_command, setup=setup_cmd)
     t.set_resources(sky.Resources(sky.AWS(), accelerators='V100'))
 
-dag = sky.optimize(dag)
 sky.execute(dag)
diff --git a/prototype/examples/debug_distributed_app.py b/prototype/examples/debug_distributed_app.py