Fixup

Author: stemann

src/array.jl

@@ -42,7 +42,9 @@ function Base.convert(::Type{Wrapper.mlx_dtype}, type::Type{<:Number})
 end
 
 function MLXArray{T, N}(array::AbstractArray{T, N}) where {T, N}
-    is_column_major = storage_order(array, StorageOrderRow) == StorageOrderColumn
+    is_column_major =
+        storage_order(array; preferred_order = ArrayStorageOrderRow) ==
+        ArrayStorageOrderColumn
     array_row_major = is_column_major ? permutedims(array, reverse(1:ndims(array))) : array
     shape = collect(Cint.(size(array)))
     dtype = convert(Wrapper.mlx_dtype, T)
@@ -144,7 +146,7 @@ function Base.elsize(array::MLXArray{T, N}) where {T, N}
 end
 
 function Base.unsafe_wrap(array::MLXArray{T, N}) where {T, N}
-    is_column_major = storage_order(array) == StorageOrderColumn
+    is_column_major = storage_order(array) == ArrayStorageOrderColumn
     size_column_major = is_column_major ? size(array) : reverse(size(array))
     wrapped_array = unsafe_wrap(
         Array, Base.unsafe_convert(Ptr{T}, array), size_column_major

src/utils.jl

@@ -1,28 +1,28 @@
-@enum StorageOrder begin
-    StorageOrderColumn
-    StorageOrderRow
+@enum ArrayStorageOrder begin
+    ArrayStorageOrderColumn
+    ArrayStorageOrderRow
 end
 
 size_to_strides_column(sz::Dims) = Base.size_to_strides(1, sz...)
 
 size_to_strides_row(sz::Dims) = reverse(Base.size_to_strides(1, reverse(sz)...))
 
 """
-    storage_order(a::AbstractArray, preferred_order::StorageOrder = StorageOrderColumn)
+    storage_order(a::AbstractArray; preferred_order::ArrayStorageOrder = ArrayStorageOrderColumn)
 
 Returns the storage order of `a`, or `preferred_order` if `a` is a scalar or vector.
 """
 function storage_order(
-    a::AbstractArray{T, N}, preferred_order::StorageOrder = StorageOrderColumn
+    a::AbstractArray{T, N}; preferred_order::ArrayStorageOrder = ArrayStorageOrderColumn
 ) where {T, N}
     if N < 2
         return preferred_order
     end
 
     if strides(a) == size_to_strides_column(size(a))
-        return StorageOrderColumn
+        return ArrayStorageOrderColumn
     elseif strides(a) == size_to_strides_row(size(a))
-        return StorageOrderRow
+        return ArrayStorageOrderRow
     else
         throw(
             ArgumentError("Unexpected strides $(strides(a)) for array of size $(size(a))")