ceos/unsloth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docker: dedupe repeated rationale comments and parametrize the pip-shim tests

Browse source 
Comment-only consolidation: the sm_103/sm_121 + cu13 JIT story and the
xformers-aarch64 note were each told four times across docker/Dockerfile; keep
the header telling canonical and cross-reference it elsewhere (same for the
workflow's six retellings of the resolve-refs-once rationale and
Dockerfile.studio's NVRTC block). Comments that pointed at the removed dev
scripts now name the underlying command or artifact instead. Non-comment lines
of both Dockerfiles and the workflow are byte-identical.

unsloth_sync_notebooks.sh folds the three copies of the override -> PATH ->
sibling helper resolution into one resolve_helper(), behavior verified for all
four modes including graceful absence under set -u.

unsloth_pip_shim.py collapses an if/else whose branches were identical and
merges the structurally duplicate _parse_include/_parse_editable into one
_parse_flag_line. The test suite folds 35 near-duplicate tests into 8
parametrized groups with exact case-count parity (69 collected before and
after, 81 passing including the nb-pip-magic suite).

Cuts another 144 lines with zero behavior change outside the two refactors.
This commit is contained in:
Daniel Han 2026-07-16 05:27:22 +00:00
commit cd982a121d
6 changed files with 261 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

15
docker/Dockerfile.studio
View file

@ -157,15 +157,12 @@ RUN set -eux \
&& rm -rf "${UNSLOTH_STUDIO_HOME}/src/.git" \
"${UNSLOTH_STUDIO_HOME}/src/studio/frontend/node_modules" \
/root/.cache \
# Stage the Studio venv's NVRTC the same way as the base venv: cu12.8 stays
# the immutable default (real lib as .cu128.orig, libnvrtc.so.12 -> it) with
# a cu13 alias (.cu13) beside it; select_cuda_jit_tools retargets it to cu13
# only for sm_103/sm_121. Run on BOTH arches, not arm64 only: amd64 sm_103
# (B300 / GB300) needs cu13 NVRTC exactly as arm64 sm_121 (DGX Spark / GB10)
# does, and the CUDA dedup below never touches cuda_nvrtc, so an amd64 Studio
# venv would otherwise have no cu13 alias to switch to on compute_103. The
# base cu13 layer installs cuda-nvrtc-13-0 on both arches, so
# /usr/local/cuda-13.0/lib64/libnvrtc.so.13 is present regardless of TARGETARCH.
# Stage the Studio venv's NVRTC exactly like the base venv (see
# docker/Dockerfile: immutable .cu128.orig default + staged .cu13 alias,
# retargeted per device by select_cuda_jit_tools). Run on BOTH arches:
# amd64 sm_103 needs cu13 NVRTC exactly as arm64 sm_121 does, the CUDA
# dedup below never touches cuda_nvrtc, and the base cu13 layer installs
# cuda-nvrtc-13-0 on both arches so libnvrtc.so.13 always exists.
&& for NVRTC_DIR in "${UNSLOTH_STUDIO_HOME}"/unsloth_studio/lib/python*/site-packages/nvidia/cuda_nvrtc/lib; do \
if [ -f "${NVRTC_DIR}/libnvrtc.so.12" ] && [ ! -L "${NVRTC_DIR}/libnvrtc.so.12" ]; then \
mv "${NVRTC_DIR}/libnvrtc.so.12" "${NVRTC_DIR}/libnvrtc.so.12.cu128.orig"; \