Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions mlx/compile.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright © 2023-2024 Apple Inc.

#include <atomic>
#include <cstdlib>
#include <map>
#include <sstream>
Expand Down Expand Up @@ -211,15 +213,15 @@ std::vector<Shape> Compiled::output_shapes(const std::vector<array>& inputs) {

namespace detail {

CompileMode& compile_mode() {
std::atomic<CompileMode>& compile_mode() {
auto get_val = []() {
if (std::getenv("MLX_DISABLE_COMPILE")) {
return CompileMode::disabled;
} else {
return CompileMode::enabled;
}
};
static CompileMode compile_mode_ = get_val();
static std::atomic<CompileMode> compile_mode_ = get_val();
return compile_mode_;
}

Expand Down Expand Up @@ -384,7 +386,7 @@ class CompilerCache {
};

CompilerCache& compiler_cache() {
static CompilerCache compiler_cache_;
static thread_local CompilerCache compiler_cache_;
return compiler_cache_;
}

Expand Down Expand Up @@ -1133,14 +1135,15 @@ ArrayFnWithExtra compile(
compile_dfs(entry.inputs, entry.outputs, inputs);

// Simplify the tape
if (compile_mode() != CompileMode::no_simplify) {
auto mode = compile_mode().load();
if (mode != CompileMode::no_simplify) {
compile_simplify(
entry.tape, parents_map, entry.outputs, /* passes */ 3);
}

// Kernel fusion to generate Compiled primitives. The tape and
// new outputs must be updated accordingly
if (compile_mode() != CompileMode::no_fuse) {
if (mode != CompileMode::no_fuse) {
compile_fuse(entry.tape, parents_map, entry.inputs, entry.outputs);
}
}
Expand Down
13 changes: 8 additions & 5 deletions python/src/transforms.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,14 @@ void init_transforms(nb::module_& m) {
const nb::object& inputs,
const nb::object& outputs,
bool shapeless) {
// Make sure each thread using mx.compile would clear its compile cache
// before python interpreter exits.
static thread_local auto clear_cache = []() {
auto atexit = nb::module_::import_("atexit");
atexit.attr("register")(
nb::cpp_function(&mx::detail::compile_clear_cache));
return true;
};
return mlx_func(
nb::cpp_function(PyCompiledFun{fun, inputs, outputs, shapeless}),
fun,
Expand Down Expand Up @@ -1534,9 +1542,4 @@ void init_transforms(nb::module_& m) {
A callable that recomputes intermediate states during gradient
computation.
)pbdoc");

// Register static Python object cleanup before the interpreter exits
auto atexit = nb::module_::import_("atexit");
atexit.attr("register")(
nb::cpp_function([]() { mx::detail::compile_clear_cache(); }));
}
Loading