Build for macOS 15 (#1208)

* Build for macos 15

* metal32 as well

* comment

---------

Co-authored-by: Awni Hannun <Awni Hannun>

Author: awni

CMakeLists.txt

@@ -85,13 +85,12 @@ elseif (MLX_BUILD_METAL)
 
   message(STATUS "Building with SDK for macOS version ${MACOS_VERSION}")
 
-  if (${MACOS_VERSION} GREATER_EQUAL 14.2)
-    set(METAL_CPP_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/metal.14.2.diff)
-    set(METAL_CPP_URL https://developer.apple.com/metal/cpp/files/metal-cpp_macOS14.2_iOS17.2.zip)
+  set(METAL_CPP_URL https://developer.apple.com/metal/cpp/files/metal-cpp_macOS15_iOS18-beta.zip)
+  if (${MACOS_VERSION} GREATER_EQUAL 15.0)
+    set(MLX_METAL_VERSION METAL_3_2)
+  elseif (${MACOS_VERSION} GREATER_EQUAL 14.2)
     set(MLX_METAL_VERSION METAL_3_1)
   elseif (${MACOS_VERSION} GREATER_EQUAL 14.0)
-    set(METAL_CPP_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/metal.14.0.diff)
-    set(METAL_CPP_URL https://developer.apple.com/metal/cpp/files/metal-cpp_macOS14_iOS17-beta.zip)
     set(MLX_METAL_VERSION METAL_3_0)
   else()
     message(FATAL_ERROR "MLX requires macOS SDK >= 14.0 to be built with MLX_BUILD_METAL=ON" )
@@ -100,7 +99,6 @@ elseif (MLX_BUILD_METAL)
   FetchContent_Declare(
     metal_cpp
     URL ${METAL_CPP_URL}
-    PATCH_COMMAND /usr/bin/patch -N -i ${METAL_CPP_PATCH} || true
   )
 
   FetchContent_MakeAvailable(metal_cpp)

cmake/metal.14.0.diff

@@ -30,7 +30,9 @@ constexpr int MAX_DISPATCHES_PER_ENCODER = 2;
 constexpr const char* default_mtllib_path = METAL_PATH;
 
 constexpr auto get_metal_version() {
-#if defined METAL_3_1
+#if defined METAL_3_2
+  return MTL::LanguageVersion3_2;
+#elif defined METAL_3_1
   return MTL::LanguageVersion3_1;
 #else
   return MTL::LanguageVersion3_0;

cmake/metal.14.2.diff

@@ -6,7 +6,7 @@
 
 using namespace metal;
 
-#if defined METAL_3_1 || (__METAL_VERSION__ >= 310)
+#if defined METAL_3_1 || defined METAL_3_2 || (__METAL_VERSION__ >= 310)
 
 typedef bfloat bfloat16_t;
 

mlx/backend/metal/device.cpp

@@ -369,7 +369,7 @@ instantiate_metal_math_funcs(
     return static_cast<otype>(__metal_simd_xor(static_cast<ctype>(data)));     \
   }
 
-#if defined METAL_3_1 || (__METAL_VERSION__ >= 310)
+#if defined METAL_3_1 || defined METAL_3_2 || (__METAL_VERSION__ >= 310)
 
 #define bfloat16_to_uint16(x) as_type<uint16_t>(x)
 #define uint16_to_bfloat16(x) as_type<bfloat16_t>(x)