fix(lemonade): revert bad tag fix; keep upstream HIP fallback + hermetic tests
The previous commit wrongly passed bundle.upstream_tag / release_tag to resolve_lemonade_rocm_choice. Lemonade uses its own versioning (b1262, b1264, …) completely independent of unslothai's tags (b9186, …), so passing a resolved unslothai tag caused a 404 and silently skipped the lemonade binary entirely. Revert both call sites to requested_tag. Keep the two valid fixes from the prior commit: - Upstream HIP fallback (llama-<tag>-bin-win-hip-radeon-x64.zip) between lemonade and CPU in direct_upstream_release_plan, so unsupported GPUs or transient lemonade failures don't silently downgrade to CPU (Codex P2) - Stub fetch_json in tests so the suite is hermetic (Codex P1)
This commit is contained in:
parent
622b17c4d2
commit
f256cea950
1 changed files with 2 additions and 2 deletions
|
|
@ -1304,7 +1304,7 @@ def direct_linux_release_plan(
|
||||||
# If the host glibc is too old, validate_prebuilt_attempts will fail
|
# If the host glibc is too old, validate_prebuilt_attempts will fail
|
||||||
# the lemonade attempt and we fall through to the source build.
|
# the lemonade attempt and we fall through to the source build.
|
||||||
lemonade_choice = resolve_lemonade_rocm_choice(
|
lemonade_choice = resolve_lemonade_rocm_choice(
|
||||||
host, "ubuntu", "linux-rocm", llama_tag = bundle.upstream_tag
|
host, "ubuntu", "linux-rocm", llama_tag = requested_tag
|
||||||
)
|
)
|
||||||
if lemonade_choice is not None:
|
if lemonade_choice is not None:
|
||||||
attempts.append(lemonade_choice)
|
attempts.append(lemonade_choice)
|
||||||
|
|
@ -1358,7 +1358,7 @@ def direct_upstream_release_plan(
|
||||||
)
|
)
|
||||||
if host.has_rocm and not host.has_usable_nvidia:
|
if host.has_rocm and not host.has_usable_nvidia:
|
||||||
lemonade_choice = resolve_lemonade_rocm_choice(
|
lemonade_choice = resolve_lemonade_rocm_choice(
|
||||||
host, "windows", "windows-hip", llama_tag = release_tag
|
host, "windows", "windows-hip", llama_tag = requested_tag
|
||||||
)
|
)
|
||||||
if lemonade_choice is not None:
|
if lemonade_choice is not None:
|
||||||
attempts.append(lemonade_choice)
|
attempts.append(lemonade_choice)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue