From 87fafa0105316a34b97a2189184d8ab2c80e7474 Mon Sep 17 00:00:00 2001 From: Yuhong Guo Date: Tue, 1 Apr 2025 11:56:58 +0800 Subject: [PATCH] Revert PR 4764 & 4813 related to R1 RoPE (#4959) --- .github/workflows/pr-test-amd.yml | 1 - python/sglang/srt/layers/rotary_embedding.py | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/.github/workflows/pr-test-amd.yml b/.github/workflows/pr-test-amd.yml index 074b855e6..a510a5ded 100644 --- a/.github/workflows/pr-test-amd.yml +++ b/.github/workflows/pr-test-amd.yml @@ -89,7 +89,6 @@ jobs: docker exec ci_sglang pip uninstall sgl-kernel -y || true docker exec -w /sglang-checkout/sgl-kernel ci_sglang bash -c "rm -f pyproject.toml && mv pyproject_rocm.toml pyproject.toml && python3 setup_rocm.py install" docker exec ci_sglang pip install -e "python[dev_hip]" - docker exec ci_sglang pip install py-spy || true docker exec -w / ci_sglang git clone https://github.com/merrymercy/human-eval.git docker exec -w /human-eval ci_sglang pip install -e . diff --git a/python/sglang/srt/layers/rotary_embedding.py b/python/sglang/srt/layers/rotary_embedding.py index 319e1c04d..fb6bdd76b 100644 --- a/python/sglang/srt/layers/rotary_embedding.py +++ b/python/sglang/srt/layers/rotary_embedding.py @@ -651,18 +651,6 @@ class DeepseekScalingRotaryEmbedding(RotaryEmbedding): query: torch.Tensor, key: torch.Tensor, offsets: Optional[torch.Tensor] = None, - ) -> Tuple[torch.Tensor, torch.Tensor]: - if _is_cuda_available: - return self.forward_cuda(positions, query, key, offsets) - else: - return self.forward_native(positions, query, key, offsets) - - def forward_native( - self, - positions: torch.Tensor, - query: torch.Tensor, - key: torch.Tensor, - offsets: Optional[torch.Tensor] = None, ) -> Tuple[torch.Tensor, torch.Tensor]: """PyTorch-native implementation equivalent to forward().""" query_rot = query[..., : self.rotary_dim]