update vllm

microsoft · Apr 12, 2024 · df5a541 · df5a541
1 parent c299820
commit df5a541
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.devcontainer/vllm/devcontainer.json b/.devcontainer/vllm/devcontainer.json
@@ -20,6 +20,7 @@
 			"extensions": [
 				"ms-python.python",
 				"ms-python.black-formatter",
+				"eeyore.yapf",
 				"1YiB.rust-bundle",
 				"dtsvet.vscode-wasm",
 				"ms-vscode.cpptools",

diff --git a/controllers/aici_abi/src/lib.rs b/controllers/aici_abi/src/lib.rs
@@ -169,6 +169,10 @@ impl MidProcessResult {
             }],
         }
     }
+
+    pub fn noop() -> Self {
+        Self::splice(0, vec![])
+    }
 }
 
 #[derive(Serialize, Deserialize)]

diff --git a/py/vllm b/py/vllm
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,6 +169,10 @@ impl MidProcessResult { @@
                 }],
             }
         }
+        pub fn noop() -> Self {
+            Self::splice(0, vec![])
+        }
     }
     #[derive(Serialize, Deserialize)]
@@ Expand Down @@
+17 −9		vllm/core/block/block_table.py
+4 −0		vllm/core/block/interfaces.py
+3 −0		vllm/core/block/naive_block.py
+3 −0		vllm/core/block/prefix_caching_block.py
+2 −1		vllm/core/block_manager_v1.py
+1 −1		vllm/core/block_manager_v2.py
+5 −2		vllm/core/scheduler.py
+6 −7		vllm/engine/llm_engine.py
+5 −6		vllm/entrypoints/openai/api_server.py
+1 −0		vllm/entrypoints/openai/protocol.py
+9 −9		vllm/entrypoints/openai/serving_aici.py
+3 −2		vllm/model_executor/layers/sampler.py
+7 −3		vllm/sequence.py