Skip to content

Commit 4747790

Browse files
authored
feat: deprecate sdk as dependency (#2149)
1 parent 095ea3e commit 4747790

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+8
-5611
lines changed

.devcontainer/post-create.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ export CARGO_TARGET_DIR=$HOME/dynamo/.build/target
5252
cargo build --locked --profile dev --features mistralrs
5353
cargo doc --no-deps
5454

55-
# create symlinks for the binaries in the deploy directory
56-
mkdir -p $HOME/dynamo/deploy/sdk/src/dynamo/sdk/cli/bin
57-
ln -sf $HOME/dynamo/.build/target/debug/dynamo-run $HOME/dynamo/deploy/sdk/src/dynamo/sdk/cli/bin/dynamo-run
58-
5955
# install the python bindings
6056
cd $HOME/dynamo/lib/bindings/python && retry maturin develop
6157

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,4 @@ generated-values.yaml
8989
TensorRT-LLM
9090

9191
# Local build artifacts for devcontainer
92-
.build/
93-
# Copied binaries to ignore
94-
deploy/sdk/src/dynamo/sdk/cli/bin
92+
.build/

Earthfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,6 @@ dynamo-build:
115115
RUN cargo build --release --locked --features llamacpp,cuda && \
116116
cargo doc --no-deps
117117

118-
# Create symlinks for wheel building
119-
RUN mkdir -p /workspace/deploy/sdk/src/dynamo/sdk/cli/bin/ && \
120-
# Remove existing symlinks
121-
rm -f /workspace/deploy/sdk/src/dynamo/sdk/cli/bin/* && \
122-
# Create new symlinks pointing to the correct location
123-
ln -sf /workspace/target/release/dynamo-run /workspace/deploy/sdk/src/dynamo/sdk/cli/bin/dynamo-run
124-
125-
126118
RUN cd /workspace/lib/bindings/python && \
127119
uv build --wheel --out-dir /workspace/dist --python 3.12
128120
RUN cd /workspace && \

components/planner/src/dynamo/planner/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
"KubernetesConnector",
2020
"LoadPlannerDefaults",
2121
"SLAPlannerDefaults",
22+
"ServiceConfig",
2223
]
2324

2425
# Import the classes
2526
from dynamo.planner.circusd import CircusController
27+
from dynamo.planner.config import ServiceConfig
2628
from dynamo.planner.defaults import LoadPlannerDefaults, SLAPlannerDefaults
2729
from dynamo.planner.kubernetes_connector import KubernetesConnector
2830
from dynamo.planner.planner_connector import PlannerConnector

components/planner/src/dynamo/planner/prometheus.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import yaml
2222

23+
from dynamo.planner.config import ServiceConfig
2324
from dynamo.planner.defaults import SLAPlannerDefaults
2425
from dynamo.runtime import DistributedRuntime, dynamo_worker
25-
from dynamo.sdk.lib.config import ServiceConfig
2626

2727
logger = logging.getLogger(__name__)
2828

container/Dockerfile.sglang

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ COPY --from=base --chown=$USERNAME:$USERNAME /usr/local/bin /usr/local/bin
258258

259259
USER $USERNAME
260260
ENV HOME=/home/$USERNAME
261-
ENV PYTHONPATH=/workspace/dynamo/deploy/sdk/src:/workspace/dynamo/components/planner/src:/workspace/examples/sglang:$PYTHONPATH
261+
ENV PYTHONPATH=/workspace/dynamo/components/planner/src:/workspace/examples/sglang:$PYTHONPATH
262262
WORKDIR $HOME
263263

264264
# https://code.visualstudio.com/remote/advancedcontainers/persist-bash-history
@@ -324,7 +324,6 @@ COPY rust-toolchain.toml /workspace/
324324
COPY lib/ /workspace/lib/
325325
COPY components /workspace/components
326326
COPY launch /workspace/launch
327-
COPY deploy/sdk /workspace/deploy/sdk
328327

329328
RUN cargo build \
330329
--release \
@@ -375,7 +374,7 @@ RUN --mount=type=bind,source=./container/launch_message.txt,target=/workspace/la
375374
sed '/^#\s/d' /workspace/launch_message.txt > ~/.launch_screen && \
376375
echo "cat ~/.launch_screen" >> ~/.bashrc
377376

378-
ENV PYTHONPATH=/workspace/dynamo/deploy/sdk/src:/workspace/dynamo/components/planner/src:/workspace/examples/sglang/utils:$PYTHONPATH
377+
ENV PYTHONPATH=/workspace/dynamo/components/planner/src:/workspace/examples/sglang/utils:$PYTHONPATH
379378

380379
########################################
381380
########## Development Image ###########

container/Dockerfile.sglang-wideep

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ ARG CARGO_BUILD_JOBS
122122
ENV CARGO_BUILD_JOBS=${CARGO_BUILD_JOBS:-16}
123123

124124
RUN cargo build --release
125-
RUN mkdir -p deploy/sdk/src/dynamo/sdk/cli/bin
126-
RUN cp target/release/dynamo-run deploy/sdk/src/dynamo/sdk/cli/bin
127125

128126
RUN cd lib/bindings/python && pip install --break-system-packages -e . && cd ../../..
129127
RUN pip install --break-system-packages -e .

container/Dockerfile.tensorrt_llm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ COPY rust-toolchain.toml /workspace/
278278
COPY lib/ /workspace/lib/
279279
COPY components /workspace/components
280280
COPY launch /workspace/launch
281-
COPY deploy/sdk /workspace/deploy/sdk
282281

283282
RUN cargo build \
284283
--release \

container/Dockerfile.vllm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ RUN uv pip install maturin[patchelf]
287287

288288
USER $USERNAME
289289
ENV HOME=/home/$USERNAME
290-
ENV PYTHONPATH=$HOME/dynamo/deploy/sdk/src:$PYTHONPATH:$HOME/dynamo/components/planner/src:$PYTHONPATH
290+
ENV PYTHONPATH=$PYTHONPATH:$HOME/dynamo/components/planner/src:$PYTHONPATH
291291
ENV CARGO_TARGET_DIR=$HOME/dynamo/.build/target
292292
WORKDIR $HOME
293293

@@ -354,7 +354,6 @@ COPY rust-toolchain.toml /workspace/
354354
COPY lib/ /workspace/lib/
355355
COPY components /workspace/components
356356
COPY launch /workspace/launch
357-
COPY deploy/sdk /workspace/deploy/sdk
358357

359358
RUN cargo build \
360359
--release \

0 commit comments

Comments
 (0)