zhangyiss/mlx
1
0
Fork 0
mirror of https://github.com/ml-explore/mlx.git synced 2025-06-24 09:21:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compile hasher for string constants. (#1677)

Browse Source 
* fix hash

* add test

* nit
This commit is contained in:
Awni Hannun 2024-12-09 09:26:18 -08:00 committed by GitHub
parent d0f471cff7
commit 35b412c099
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/src/transforms.cpp
View File

@ -433,19 +433,18 @@ struct PyCompiledFun {
auto d = nb::cast<nb::dict>(obj); auto d = nb::cast<nb::dict>(obj);
constants.push_back(dict_identifier); constants.push_back(dict_identifier);
for (auto item : d) { for (auto item : d) {
auto r = item.first.attr("__hash__"); auto r = item.first.attr("__hash__")();
constants.push_back(*reinterpret_cast<uint64_t*>(&r)); constants.push_back(nb::cast<int64_t>(r));
recurse(item.second); recurse(item.second);
} }
} else if (nb::isinstance<array>(obj)) { } else if (nb::isinstance<array>(obj)) {
inputs.push_back(nb::cast<array>(obj)); inputs.push_back(nb::cast<array>(obj));
constants.push_back(array_identifier); constants.push_back(array_identifier);
} else if (nb::isinstance<nb::str>(obj)) { } else if (nb::isinstance<nb::str>(obj)) {
auto r = obj.attr("__hash__"); auto r = obj.attr("__hash__")();
constants.push_back(*reinterpret_cast<uint64_t*>(&r)); constants.push_back(nb::cast<int64_t>(r));
} else if (nb::isinstance<nb::int_>(obj)) { } else if (nb::isinstance<nb::int_>(obj)) {
auto r = nb::cast<int64_t>(obj); constants.push_back(nb::cast<int64_t>(obj));
constants.push_back(*reinterpret_cast<uint64_t*>(&r));
} else if (nb::isinstance<nb::float_>(obj)) { } else if (nb::isinstance<nb::float_>(obj)) {
auto r = nb::cast<double>(obj); auto r = nb::cast<double>(obj);
constants.push_back(*reinterpret_cast<uint64_t*>(&r)); constants.push_back(*reinterpret_cast<uint64_t*>(&r));

21
python/tests/test_compile.py
View File

@ -579,6 +579,27 @@ class TestCompile(mlx_tests.MLXTestCase):
self.assertEqual(counter[0], 2) self.assertEqual(counter[0], 2)
y = 1.0
@mx.compile
def fun(x, constant):
return x + y
constant1 = "abc"
out = fun(mx.array(0.0), constant1)
self.assertEqual(out, mx.array(1.0))
# new object, same value, no recompilation
y = 2.0
constant2 = "abc".encode("utf-8").decode("utf-8")
out = fun(mx.array(0.0), constant2)
self.assertEqual(out, mx.array(1.0))
# same object, new value, recompilation
constant2 = "xyz"
out = fun(mx.array(0.0), constant2)
self.assertEqual(out, mx.array(2.0))
def test_compile_inf(self): def test_compile_inf(self):
@mx.compile @mx.compile
def fun(x): def fun(x):