Skip to content

mistral-rs: make free again, refactor #398403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SomeoneSerge merged 2 commits into from
Apr 13, 2025
+9 −9
Merged

mistral-rs: make free again, refactor #398403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83cb45b
mistral-rs: revert linking CUDA in CPU variant
GaetanLepage Apr 13, 2025
8ead8d0
mistral-rs: refactor use of stdenv.hostPlatform
GaetanLepage Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkgs/by-name/mi/mistral-rs/package.nix
View file
Open in desktop
Comment thread
GaetanLepage marked this conversation as resolved.
Outdated
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
}:

let
inherit (stdenv) hostPlatform;

accelIsValid = builtins.elem acceleration [
null
false
Expand Down Expand Up @@ -67,7 +69,7 @@ let
metalSupport =
assert accelIsValid;
(acceleration == "metal")
|| (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null));
|| (hostPlatform.isDarwin && hostPlatform.isAarch64 && (acceleration == null));

in
rustPlatform.buildRustPackage (finalAttrs: {
Expand Down Expand Up @@ -119,7 +121,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildFeatures =
lib.optionals cudaSupport [ "cuda" ]
++ lib.optionals mklSupport [ "mkl" ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "metal" ];
++ lib.optionals (hostPlatform.isDarwin && metalSupport) [ "metal" ];

env =
{
Expand Down Expand Up @@ -149,7 +151,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart;
});

appendRunpaths = [
appendRunpaths = lib.optionals cudaSupport [
(lib.makeLibraryPath [
cudaPackages.libcublas
cudaPackages.libcurand
Expand All @@ -159,7 +161,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
# swagger-ui will once more be copied in the target directory during the check phase
# Not deleting the existing unpacked archive leads to a `PermissionDenied` error
preCheck = ''
rm -rf target/${stdenv.hostPlatform.config}/release/build/
rm -rf target/${hostPlatform.config}/release/build/
'';

# Prevent checkFeatures from inheriting buildFeatures because
Expand All @@ -185,13 +187,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
tests = {
version = testers.testVersion { package = mistral-rs; };

withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") (
withMkl = lib.optionalAttrs (hostPlatform.isLinux && hostPlatform.isx86_64) (
mistral-rs.override { acceleration = "mkl"; }
);
withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux (
mistral-rs.override { acceleration = "cuda"; }
);
withMetal = lib.optionalAttrs (stdenv.hostPlatform == "aarch64-darwin") (
withCuda = lib.optionalAttrs hostPlatform.isLinux (mistral-rs.override { acceleration = "cuda"; });
withMetal = lib.optionalAttrs (hostPlatform.isDarwin && hostPlatform.isAarch64) (
mistral-rs.override { acceleration = "metal"; }
);
};
Expand Down