mirror of
https://github.com/ml-explore/mlx.git
synced 2025-12-16 01:49:05 +08:00
Compare commits
2 Commits
1b021f6984
...
0408ba0a76
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0408ba0a76 | ||
|
|
cbad6c3093 |
25
mlx/ops.cpp
25
mlx/ops.cpp
@@ -2862,21 +2862,30 @@ array matmul(
|
|||||||
<< " second input with shape " << b.shape() << ".";
|
<< " second input with shape " << b.shape() << ".";
|
||||||
throw std::invalid_argument(msg.str());
|
throw std::invalid_argument(msg.str());
|
||||||
}
|
}
|
||||||
// Type promotion
|
|
||||||
auto out_type = promote_types(a.dtype(), b.dtype());
|
// complex matmul using Karatsuba's Algorithm
|
||||||
// Complex matmul in terms of real matmuls
|
if (a.dtype() == complex64 || b.dtype() == complex64) {
|
||||||
if (out_type == complex64) {
|
// Extract real and imaginary parts
|
||||||
auto a_real = real(a, s);
|
auto a_real = real(a, s);
|
||||||
auto b_real = real(b, s);
|
|
||||||
auto a_imag = imag(a, s);
|
auto a_imag = imag(a, s);
|
||||||
|
auto b_real = real(b, s);
|
||||||
auto b_imag = imag(b, s);
|
auto b_imag = imag(b, s);
|
||||||
auto c_real =
|
|
||||||
subtract(matmul(a_real, b_real, s), matmul(a_imag, b_imag, s), s);
|
// Compute real and imaginary components of the result
|
||||||
auto c_imag = add(matmul(a_real, b_imag, s), matmul(a_imag, b_real, s), s);
|
auto m1 = matmul(a_real, b_real, s);
|
||||||
|
auto m2 = matmul(a_imag, b_imag, s);
|
||||||
|
auto m3 = matmul(add(a_real, a_imag, s), add(b_real, b_imag, s), s);
|
||||||
|
|
||||||
|
auto c_real = subtract(m1, m2, s);
|
||||||
|
auto c_imag = subtract(m3, add(m1, m2, s), s);
|
||||||
|
|
||||||
return add(
|
return add(
|
||||||
c_real, multiply(array(complex64_t{0, 1}, complex64), c_imag, s), s);
|
c_real, multiply(array(complex64_t{0, 1}, complex64), c_imag, s), s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Type promotion
|
||||||
|
auto out_type = promote_types(a.dtype(), b.dtype());
|
||||||
|
|
||||||
if (!issubdtype(out_type, floating)) {
|
if (!issubdtype(out_type, floating)) {
|
||||||
std::ostringstream msg;
|
std::ostringstream msg;
|
||||||
msg << "[matmul] Only real floating point types are supported but "
|
msg << "[matmul] Only real floating point types are supported but "
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define MLX_VERSION_MAJOR 0
|
#define MLX_VERSION_MAJOR 0
|
||||||
#define MLX_VERSION_MINOR 25
|
#define MLX_VERSION_MINOR 26
|
||||||
#define MLX_VERSION_PATCH 2
|
#define MLX_VERSION_PATCH 0
|
||||||
#define MLX_VERSION_NUMERIC \
|
#define MLX_VERSION_NUMERIC \
|
||||||
(100000 * MLX_VERSION_MAJOR + 1000 * MLX_VERSION_MINOR + MLX_VERSION_PATCH)
|
(100000 * MLX_VERSION_MAJOR + 1000 * MLX_VERSION_MINOR + MLX_VERSION_PATCH)
|
||||||
|
|
||||||
|
|||||||
@@ -1210,13 +1210,6 @@ class TestBlas(mlx_tests.MLXTestCase):
|
|||||||
self.assertTrue(np.allclose(c, c_np))
|
self.assertTrue(np.allclose(c, c_np))
|
||||||
|
|
||||||
# Test addmm
|
# Test addmm
|
||||||
M = 16
|
|
||||||
K = 50
|
|
||||||
N = 32
|
|
||||||
|
|
||||||
def rand(shape):
|
|
||||||
return mx.random.uniform(shape=shape) + 1j * mx.random.uniform(shape=shape)
|
|
||||||
|
|
||||||
a = rand((M, K))
|
a = rand((M, K))
|
||||||
b = rand((K, N))
|
b = rand((K, N))
|
||||||
c = rand((M, N))
|
c = rand((M, N))
|
||||||
@@ -1224,6 +1217,13 @@ class TestBlas(mlx_tests.MLXTestCase):
|
|||||||
out_np = 2.0 * np.matmul(a, b) + 2.0 * c
|
out_np = 2.0 * np.matmul(a, b) + 2.0 * c
|
||||||
self.assertTrue(np.allclose(out, out_np))
|
self.assertTrue(np.allclose(out, out_np))
|
||||||
|
|
||||||
|
# complex with real
|
||||||
|
a = rand((M, K)).real
|
||||||
|
b = rand((K, N))
|
||||||
|
c = mx.matmul(a, b)
|
||||||
|
c_np = np.matmul(a, b)
|
||||||
|
self.assertTrue(np.allclose(out, out_np))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
Reference in New Issue
Block a user