From 1e27420d4e762e0d43a8412b280e71afb1821263 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sat, 21 Dec 2024 10:29:37 -0800 Subject: [PATCH 1/4] prrte: enable for darwin The package builds just fine on darwin and wasn't broken --- pkgs/by-name/pr/prrte/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 980b4d889d43d..1deb96f3a6c7b 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -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; }; } From eeffd96dbd1fa95190b1e48022ff46fd3faf94cd Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sun, 22 Dec 2024 12:40:45 -0800 Subject: [PATCH 2/4] openmpi: build against external `prrte` on all platforms `openmpi` can build against either an external `prrte` or its own vendored `prrte`. This change prefers using the external `prrte` built by Nixpkgs on all platform (including Darwin, now that the `prrte` build is enabled on all platforms) --- pkgs/by-name/op/openmpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix index 7fcca51c739e3..719247b58a435 100644 --- a/pkgs/by-name/op/openmpi/package.nix +++ b/pkgs/by-name/op/openmpi/package.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { zlib libevent hwloc + prrte ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl @@ -92,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { pmix ucx ucc - prrte ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ rdma-core ] @@ -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 From 1d06e7cf72c7793d4ad6d067711bd869b7c15d63 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sat, 21 Dec 2024 10:35:11 -0800 Subject: [PATCH 3/4] python312Packages.mlx: add Gabriella439 as maintainer --- pkgs/development/python-modules/mlx/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index ac90ebb898082..9ae14f0dadaac 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -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 + ]; }; } From 32ff266fcb3493bcd064b987323c70956c434c76 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sat, 21 Dec 2024 10:24:38 -0800 Subject: [PATCH 4/4] =?UTF-8?q?python312Packages.mlx:=200.18.0=20=E2=86=92?= =?UTF-8?q?=200.21.1;=20unbreak?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/mlx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 9ae14f0dadaac..aa765f0537a5a 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -28,13 +28,13 @@ let in buildPythonPackage rec { pname = "mlx"; - version = "0.18.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx"; rev = "refs/tags/v${version}"; - hash = "sha256-eFKjCrutqrmhZKzRrLq5nYl0ieqLvoXpbnTxA1NEhWo="; + hash = "sha256-wxv9bA9e8VyFv/FMh63sUTTNgkXHGQJNQhLuVynczZA="; }; pyproject = true;