Files
zeekay 37ff59034b merge: upstream/master (-X ours, brand preserved)
# Conflicts:
#	hanzo-engine/src/device_map.rs
#	hanzo-engine/src/device_map/mappers.rs
#	hanzo-engine/src/device_map/mask.rs
#	hanzo-engine/src/device_map/mod.rs
#	hanzo-engine/src/device_map/peer.rs
#	hanzo-engine/src/moe/experts.rs
#	hanzo-engine/src/moe/experts/backends.rs
#	hanzo-engine/src/moe/experts/checkpoint.rs
#	hanzo-engine/src/moe/experts/config.rs
#	hanzo-engine/src/moe/experts/forward.rs
#	hanzo-engine/src/moe/experts/mod.rs
#	hanzo-engine/src/paged_attention/attention_backend.rs
#	hanzo-engine/src/perf_flags.rs
#	hanzo-engine/src/pipeline/cuda_graph.rs
#	hanzo-paged-attn/src/cuda/backend/flashinfer.rs
#	hanzo-paged-attn/src/cuda/flashinfer/attention/default_prefill_params.cuh
#	hanzo-paged-attn/src/cuda/flashinfer/attention/mask.cuh
#	hanzo-paged-attn/src/cuda/flashinfer/attention/prefill.cuh
#	hanzo-paged-attn/src/cuda/flashinfer/fp16.h
#	hanzo-paged-attn/src/cuda/flashinfer/frag_layout_swizzle.cuh
#	hanzo-paged-attn/src/cuda/flashinfer/mma.cuh
#	hanzo-paged-attn/src/cuda/flashinfer/permuted_smem.cuh
#	hanzo-paged-attn/src/cuda/flashinfer_decode.cu
#	hanzo-quant/src/metal_kernels/moe.metal
#	hanzo-quant/src/metal_kernels/rotary.metal
#	hanzo-quant/src/metal_kernels/softcap.metal
#	hanzo-server-core/src/anthropic.rs
#	hanzo-server-core/src/route_registry.rs
#	mistralrs-core/Cargo.toml
#	mistralrs-core/src/lib.rs
2026-06-02 10:21:05 -07:00
..