commit f3edfab1bcc136020889d01ca1bf1cce6212430e · pyrox.dev/nixpkgs

+15

pkgs/development/python-modules/mlx/darwin-build-fixes.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index ab8aea44..9e1b06f4 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -100,9 +100,7 @@ elseif(MLX_BUILD_METAL)

     

       6
       6
       +
          endif()

     

       7
       7
       +
        

     

       8
       8
       +
          # Throw an error if xcrun not found

     

       9
       9
       +
       -  execute_process(

     

       10
       10
       +
       -    COMMAND zsh "-c" "/usr/bin/xcrun -sdk macosx --show-sdk-version"

     

       11
       11
       +
       -    OUTPUT_VARIABLE MACOS_SDK_VERSION COMMAND_ERROR_IS_FATAL ANY)

     

       12
       12
       +
       +  set(MACOS_SDK_VERSION @sdkVersion@)

     

       13
       13
       +
        

     

       14
       14
       +
          if(${MACOS_SDK_VERSION} LESS 14.0)

     

       15
       15
       +
            message(

+130 -70

pkgs/development/python-modules/mlx/default.nix

···

       1
       1
        
       {

     

       2
       2
       +
         buildPythonPackage,

     

       3
       3
       +
         fetchFromGitHub,

     

       2
       4
        
         lib,

     

       3
       3
       -
         fetchFromGitHub,

     

       4
       4
       -
         buildPythonPackage,

     

       5
       5
       +
         replaceVars,

     

       6
       6
       +
         stdenv,

     

       7
       7
       +
       

     

       8
       8
       +
         # build-system

     

       9
       9
       +
         setuptools,

     

       10
       10
       +
       

     

       11
       11
       +
         # nativeBuildInputs

     

       12
       12
       +
         cmake,

     

       13
       13
       +
       

     

       14
       14
       +
         # buildInputs

     

       15
       15
       +
         apple-sdk_14,

     

       16
       16
       +
         fmt_10,

     

       17
       17
       +
         nanobind,

     

       18
       18
       +
         nlohmann_json,

     

       5
       19
        
         pybind11,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         xcbuild,

     

       8
       8
       -
         zsh,

     

       9
       9
       -
         blas,

     

       10
       10
       -
         lapack,

     

       11
       11
       -
         setuptools,

     

       20
       20
       +
       

     

       21
       21
       +
         # tests

     

       22
       22
       +
         numpy,

     

       23
       23
       +
         pytestCheckHook,

     

       24
       24
       +
         python,

     

       25
       25
       +
         runCommand,

     

       12
       26
        
       }:

     

       13
       27
        
       

     

       14
       28
        
       let

     
···

       16
       30
        
         gguf-tools = fetchFromGitHub {

     

       17
       31
        
           owner = "antirez";

     

       18
       32
        
           repo = "gguf-tools";

     

       19
       19
       -
           rev = "af7d88d808a7608a33723fba067036202910acb3";

     

       20
       20
       -
           hash = "sha256-LqNvnUbmq0iziD9VP5OTJCSIy+y/hp5lKCUV7RtKTvM=";

     

       33
       33
       +
           rev = "8fa6eb65236618e28fd7710a0fba565f7faa1848";

     

       34
       34
       +
           hash = "sha256-15FvyPOFqTOr5vdWQoPnZz+mYH919++EtghjozDlnSA=";

     

       21
       35
        
         };

     

       22
       22
       -
         nlohmann_json = fetchFromGitHub {

     

       23
       23
       -
           owner = "nlohmann";

     

       24
       24
       -
           repo = "json";

     

       25
       25
       -
           rev = "v3.11.3";

     

       26
       26
       -
           hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg=";

     

       27
       27
       -
         };

     

       28
       28
       -
       in

     

       29
       29
       -
       buildPythonPackage rec {

     

       30
       30
       -
         pname = "mlx";

     

       31
       31
       -
         version = "0.21.1";

     

       32
       36
        
       

     

       33
       33
       -
         src = fetchFromGitHub {

     

       34
       34
       -
           owner = "ml-explore";

     

       35
       35
       -
           repo = "mlx";

     

       36
       36
       -
           rev = "refs/tags/v${version}";

     

       37
       37
       -
           hash = "sha256-wxv9bA9e8VyFv/FMh63sUTTNgkXHGQJNQhLuVynczZA=";

     

       38
       38
       -
         };

     

       37
       37
       +
         mlx = buildPythonPackage rec {

     

       38
       38
       +
           pname = "mlx";

     

       39
       39
       +
           version = "0.25.2";

     

       40
       40
       +
           pyproject = true;

     

       39
       41
        
       

     

       40
       40
       -
         pyproject = true;

     

       42
       42
       +
           src = fetchFromGitHub {

     

       43
       43
       +
             owner = "ml-explore";

     

       44
       44
       +
             repo = "mlx";

     

       45
       45
       +
             tag = "v${version}";

     

       46
       46
       +
             hash = "sha256-fkf/kKATr384WduFG/X81c5InEAZq5u5+hwrAJIg7MI=";

     

       47
       47
       +
           };

     

       41
       48
        
       

     

       42
       42
       -
         patches = [

     

       43
       43
       -
           # With Darwin SDK 11 we cannot include vecLib/cblas_new.h, this needs to wait for PR #229210

     

       44
       44
       -
           # In the meantime, pretend Accelerate is not available and use blas/lapack instead.

     

       45
       45
       -
           ./disable-accelerate.patch

     

       46
       46
       -
         ];

     

       49
       49
       +
           patches = [

     

       50
       50
       +
             (replaceVars ./darwin-build-fixes.patch {

     

       51
       51
       +
               sdkVersion = apple-sdk_14.version;

     

       52
       52
       +
             })

     

       53
       53
       +
           ];

     

       47
       54
        
       

     

       48
       48
       -
         postPatch = ''

     

       49
       49
       -
           substituteInPlace CMakeLists.txt \

     

       50
       50
       -
             --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" \

     

       51
       51
       -
         '';

     

       55
       55
       +
           postPatch = ''

     

       56
       56
       +
             substituteInPlace pyproject.toml \

     

       57
       57
       +
               --replace-fail "nanobind==2.4.0" "nanobind>=2.4.0"

     

       58
       58
       +
       

     

       59
       59
       +
             substituteInPlace mlx/backend/cpu/jit_compiler.cpp \

     

       60
       60
       +
               --replace-fail "g++" "$CXX"

     

       61
       61
       +
           '';

     

       52
       62
        
       

     

       53
       53
       -
         dontUseCmakeConfigure = true;

     

       63
       63
       +
           dontUseCmakeConfigure = true;

     

       54
       64
        
       

     

       55
       55
       -
         # updates the wrong fetcher rev attribute

     

       56
       56
       -
         passthru.skipBulkUpdate = true;

     

       65
       65
       +
           enableParallelBuilding = true;

     

       66
       66
       +
       

     

       67
       67
       +
           # Allows multiple cores to be used in Python builds.

     

       68
       68
       +
           postUnpack = ''

     

       69
       69
       +
             export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"

     

       70
       70
       +
           '';

     

       57
       71
        
       

     

       58
       58
       -
         env = {

     

       59
       59
       -
           PYPI_RELEASE = version;

     

       60
       60
       -
           # we can't use Metal compilation with Darwin SDK 11

     

       61
       61
       -
           CMAKE_ARGS = toString [

     

       62
       62
       -
             (lib.cmakeBool "MLX_BUILD_METAL" false)

     

       63
       63
       -
             (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")

     

       64
       64
       -
             (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json}")

     

       72
       72
       +
           # updates the wrong fetcher rev attribute

     

       73
       73
       +
           passthru.skipBulkUpdate = true;

     

       74
       74
       +
       

     

       75
       75
       +
           env = {

     

       76
       76
       +
             PYPI_RELEASE = version;

     

       77
       77
       +
             CMAKE_ARGS = toString [

     

       78
       78
       +
               # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source.

     

       79
       79
       +
               # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape

     

       80
       80
       +
               # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper`

     

       81
       81
       +
               # or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016).

     

       82
       82
       +
               (lib.cmakeBool "MLX_BUILD_METAL" false)

     

       83
       83
       +
               (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")

     

       84
       84
       +
               (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}")

     

       85
       85
       +
               (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_FMT" "${fmt_10.src}")

     

       86
       86
       +
             ];

     

       87
       87
       +
           };

     

       88
       88
       +
       

     

       89
       89
       +
           build-system = [

     

       90
       90
       +
             setuptools

     

       65
       91
        
           ];

     

       66
       66
       -
         };

     

       67
       92
        
       

     

       68
       68
       -
         nativeBuildInputs = [

     

       69
       69
       -
           cmake

     

       70
       70
       -
           pybind11

     

       71
       71
       -
           xcbuild

     

       72
       72
       -
           zsh

     

       73
       73
       -
           gguf-tools

     

       74
       74
       -
           nlohmann_json

     

       75
       75
       -
           setuptools

     

       76
       76
       -
         ];

     

       93
       93
       +
           nativeBuildInputs = [

     

       94
       94
       +
             cmake

     

       95
       95
       +
           ];

     

       77
       96
        
       

     

       78
       78
       -
         buildInputs = [

     

       79
       79
       -
           blas

     

       80
       80
       -
           lapack

     

       81
       81
       -
         ];

     

       97
       97
       +
           buildInputs = [

     

       98
       98
       +
             apple-sdk_14

     

       99
       99
       +
             fmt_10

     

       100
       100
       +
             gguf-tools

     

       101
       101
       +
             nanobind

     

       102
       102
       +
             nlohmann_json

     

       103
       103
       +
             pybind11

     

       104
       104
       +
           ];

     

       82
       105
        
       

     

       83
       83
       -
         meta = with lib; {

     

       84
       84
       -
           homepage = "https://github.com/ml-explore/mlx";

     

       85
       85
       -
           description = "Array framework for Apple silicon";

     

       86
       86
       -
           changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";

     

       87
       87
       -
           license = licenses.mit;

     

       88
       88
       -
           platforms = [ "aarch64-darwin" ];

     

       89
       89
       -
           maintainers = with maintainers; [

     

       90
       90
       -
             viraptor

     

       91
       91
       -
             Gabriella439

     

       106
       106
       +
           pythonImportsCheck = [ "mlx" ];

     

       107
       107
       +
       

     

       108
       108
       +
           # Run the mlx Python test suite.

     

       109
       109
       +
           nativeCheckInputs = [

     

       110
       110
       +
             numpy

     

       111
       111
       +
             pytestCheckHook

     

       112
       112
       +
           ];

     

       113
       113
       +
       

     

       114
       114
       +
           pytestFlagsArray = [

     

       115
       115
       +
             "python/tests/"

     

       92
       116
        
           ];

     

       117
       117
       +
       

     

       118
       118
       +
           # Additional testing by executing the example Python scripts supplied with mlx

     

       119
       119
       +
           # using the version of the library we've built.

     

       120
       120
       +
           passthru.tests = {

     

       121
       121
       +
             mlxTest =

     

       122
       122
       +
               runCommand "run-mlx-examples"

     

       123
       123
       +
                 {

     

       124
       124
       +
                   buildInputs = [ mlx ];

     

       125
       125
       +
                   nativeBuildInputs = [ python ];

     

       126
       126
       +
                 }

     

       127
       127
       +
                 ''

     

       128
       128
       +
                   cp ${src}/examples/python/logistic_regression.py .

     

       129
       129
       +
                   ${python.interpreter} logistic_regression.py

     

       130
       130
       +
                   rm logistic_regression.py

     

       131
       131
       +
       

     

       132
       132
       +
                   cp ${src}/examples/python/linear_regression.py .

     

       133
       133
       +
                   ${python.interpreter} linear_regression.py

     

       134
       134
       +
                   rm linear_regression.py

     

       135
       135
       +
       

     

       136
       136
       +
                   touch $out

     

       137
       137
       +
                 '';

     

       138
       138
       +
           };

     

       139
       139
       +
       

     

       140
       140
       +
           meta = {

     

       141
       141
       +
             homepage = "https://github.com/ml-explore/mlx";

     

       142
       142
       +
             description = "Array framework for Apple silicon";

     

       143
       143
       +
             changelog = "https://github.com/ml-explore/mlx/releases/tag/${src.tag}";

     

       144
       144
       +
             license = lib.licenses.mit;

     

       145
       145
       +
             platforms = [ "aarch64-darwin" ];

     

       146
       146
       +
             maintainers = with lib.maintainers; [

     

       147
       147
       +
               viraptor

     

       148
       148
       +
               Gabriella439

     

       149
       149
       +
               cameronyule

     

       150
       150
       +
             ];

     

       151
       151
       +
           };

     

       93
       152
        
         };

     

       94
       94
       -
       }

     

       153
       153
       +
       in

     

       154
       154
       +
       mlx

-13

pkgs/development/python-modules/mlx/disable-accelerate.patch

···

       1
       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index 2d6bef9..d099673 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -104,7 +104,7 @@ elseif (MLX_BUILD_METAL)

     

       6
       6
       -
            ${QUARTZ_LIB})

     

       7
       7
       -
        endif()

     

       8
       8
       -
        

     

       9
       9
       -
       -find_library(ACCELERATE_LIBRARY Accelerate)

     

       10
       10
       -
       +#find_library(ACCELERATE_LIBRARY Accelerate)

     

       11
       11
       -
        if (MLX_BUILD_ARM AND ACCELERATE_LIBRARY)

     

       12
       12
       -
          message(STATUS "Accelerate found ${ACCELERATE_LIBRARY}")

     

       13
       13
       -
          set(MLX_BUILD_ACCELERATE ON)