A high-performance inference engine for AI models
Control metal modules cache path to remove `writableTmpDirAsHomeHook` (#809)
uuuvne4e94678d841
diff --git a/crates/uzu-engine/build/metal/compiler.rs b/crates/uzu-engine/build/metal/compiler.rsindex b732f9110..bd8105175 100644--- a/crates/uzu-engine/build/metal/compiler.rs+++ b/crates/uzu-engine/build/metal/compiler.rs@@ -96,16 +96,20 @@ impl MetalCompiler {let gpu_types_directory = source_directory.join("generated");- let output_directory = PathBuf::from(env::var("OUT_DIR").context("missing OUT_DIR")?).join("metal");+ let out_dir = PathBuf::from(env::var("OUT_DIR").context("missing OUT_DIR")?);++ let output_directory = out_dir.join("metal");fs::create_dir_all(&output_directory).with_context(|| format!("cannot create {}", output_directory.display()))?;+ let modules_cache_path = out_dir.join("metal_modules_cache");+let metallib_compressed = match env::var("OPT_LEVEL").context("missing OPT_LEVEL")?.as_str() {"0" | "1" | "2" => false, // treat opt-level 0/1/2 as debug/test build where size doesn't matter_ => true, // treat everything else (3,s,z) as release build where size matters};- let toolchain = MetalToolchain::from_env_with_include_dir(Some(gpu_types_directory.clone()))+ let toolchain = MetalToolchain::new(modules_cache_path, gpu_types_directory.clone()).await.context("cannot create toolchain")?;diff --git a/crates/uzu-engine/build/metal/toolchain.rs b/crates/uzu-engine/build/metal/toolchain.rsindex be8274809..680575077 100644--- a/crates/uzu-engine/build/metal/toolchain.rs+++ b/crates/uzu-engine/build/metal/toolchain.rs@@ -94,12 +94,16 @@ pub struct MetalToolchain {std: MetalStd,opt_flags: Box<[OsString]>,extra_options: Box<[OsString]>,- include_dirs: Box<[PathBuf]>,+ modules_cache_path: PathBuf,+ include_dir: PathBuf,cache_key: [u8; blake3::OUT_LEN],}impl MetalToolchain {- pub async fn from_env_with_include_dir(include_dir: Option<PathBuf>) -> anyhow::Result<Self> {+ pub async fn new(+ modules_cache_path: PathBuf,+ include_dir: PathBuf,+ ) -> anyhow::Result<Self> {let sdk = MetalSdk::from_env().context("cannot get sdk")?;let std = MetalStd::Metal4_0;@@ -122,8 +126,6 @@ impl MetalToolchain {let extra_options: Box<[OsString]> =Box::new([OsString::from(format!("-m{}-version-min={}", sdk.os(), std.min_os()))]);- let include_dirs = include_dir.into_iter().collect();-let cache_key = {let mut hasher = blake3::Hasher::new();@@ -160,7 +162,8 @@ impl MetalToolchain {std,opt_flags,extra_options,- include_dirs,+ modules_cache_path,+ include_dir,cache_key,})}@@ -175,13 +178,14 @@ impl MetalToolchain {&self.cache_key}- fn add_include_dirs(+ fn add_common_args(&self,cmd: &mut Command,) {- for dir in self.include_dirs.iter() {- cmd.arg("-I").arg(dir);- }+ let mut modules_cache_path_arg = OsString::from("-fmodules-cache-path=");+ modules_cache_path_arg.push(&self.modules_cache_path);+ cmd.arg(modules_cache_path_arg);+ cmd.arg("-I").arg(&self.include_dir);}pub async fn analyze(@@ -198,7 +202,7 @@ impl MetalToolchain {.arg(format!("-std={}", self.std.to_str())).args(self.extra_options.as_ref());- self.add_include_dirs(&mut cmd);+ self.add_common_args(&mut cmd);cmd.arg("-DDSL_ANALYZE").arg(path)@@ -264,7 +268,7 @@ impl MetalToolchain {.args(self.extra_options.as_ref()).args(self.opt_flags.as_ref());- self.add_include_dirs(&mut cmd);+ self.add_common_args(&mut cmd);cmd.arg("-include").arg(source.as_ref())diff --git a/flake.nix b/flake.nixindex a85e42b95..365dc5e38 100644--- a/flake.nix+++ b/flake.nix@@ -108,8 +108,7 @@install -Dm755 target/release/cli $out/bin/mirai'';- inherit buildInputs;- nativeBuildInputs = nativeBuildInputs ++ (with pkgs; (lib.optionals pkgs.stdenv.hostPlatform.isDarwin [writableTmpDirAsHomeHook]));+ inherit buildInputs nativeBuildInputs;doCheck = false;};