Skip to content
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

python312Packages.mlx: upgrade and fix build #367011

Merged
merged 4 commits into from
Dec 23, 2024
+9 −6
Merged

python312Packages.mlx: upgrade and fix build #367011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e27420
prrte: enable for darwin
Gabriella439 Dec 21, 2024
eeffd96
openmpi: build against external `prrte` on all platforms
Gabriella439 Dec 22, 2024
1d06e7c
python312Packages.mlx: add Gabriella439 as maintainer
Gabriella439 Dec 21, 2024
32ff266
python312Packages.mlx: 0.18.0 → 0.21.1; unbreak
Gabriella439 Dec 21, 2024
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
4 changes: 2 additions & 2 deletions pkgs/by-name/op/openmpi/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ stdenv.mkDerivation (finalAttrs: {
zlib
libevent
hwloc
prrte
]
++ lib.optionals stdenv.hostPlatform.isLinux [
libnl
numactl
pmix
ucx
ucc
prrte
]
++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ rdma-core ]
Expand All @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-pmix=${lib.getDev pmix}"
"--with-pmix-libdir=${lib.getLib pmix}/lib"
# Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables
(lib.withFeatureAs stdenv.hostPlatform.isLinux "prrte" (lib.getBin prrte))
(lib.withFeatureAs true "prrte" (lib.getBin prrte))
(lib.withFeature enableSGE "sge")
(lib.enableFeature enablePrefix "mpirun-prefix-by-default")
# TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/pr/prrte/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
homepage = "https://docs.prrte.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ markuskowa ];
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
Gabriella439 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I once heard someone saying that platforms.unix includes BSD, which is not necessarily a supported platform :). However, for most practical purposes, this is the same, as Hydra doesn't build for BSD ;). Just noting it here for you so you'd know for next time. Don't worry this is not a blocker for the PR.

};
}
9 changes: 6 additions & 3 deletions pkgs/development/python-modules/mlx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ let
in
buildPythonPackage rec {
pname = "mlx";
version = "0.18.0";
version = "0.21.1";
Gabriella439 marked this conversation as resolved.
Show resolved Hide resolved

src = fetchFromGitHub {
owner = "ml-explore";
repo = "mlx";
rev = "refs/tags/v${version}";
hash = "sha256-eFKjCrutqrmhZKzRrLq5nYl0ieqLvoXpbnTxA1NEhWo=";
hash = "sha256-wxv9bA9e8VyFv/FMh63sUTTNgkXHGQJNQhLuVynczZA=";
};

pyproject = true;
Expand Down Expand Up @@ -83,6 +83,9 @@ buildPythonPackage rec {
changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
license = licenses.mit;
platforms = [ "aarch64-darwin" ];
maintainers = with maintainers; [ viraptor ];
maintainers = with maintainers; [
viraptor
Gabriella439
];
Gabriella439 marked this conversation as resolved.
Show resolved Hide resolved
};
}
Loading