From 8b22e1b1f164870969b4c38148a58d7ed30f030e Mon Sep 17 00:00:00 2001 From: Arthur Brussee Date: Fri, 6 Dec 2024 12:44:27 +0000 Subject: [PATCH] Downgrade burn To resolve some issues with the new matmul --- Cargo.lock | 56 ++++++++++++++++++++++++++---------------------------- Cargo.toml | 8 ++++---- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8001f42b..be5d32f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "burn" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-core", "burn-train", @@ -982,7 +982,7 @@ dependencies = [ [[package]] name = "burn-autodiff" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-common", "burn-tensor", @@ -994,7 +994,7 @@ dependencies = [ [[package]] name = "burn-candle" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-tensor", "candle-core", @@ -1005,7 +1005,7 @@ dependencies = [ [[package]] name = "burn-common" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "cubecl-common", "getrandom", @@ -1017,7 +1017,7 @@ dependencies = [ [[package]] name = "burn-core" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "ahash", "bincode", @@ -1052,7 +1052,7 @@ dependencies = [ [[package]] name = "burn-cuda" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-fusion", "burn-jit", @@ -1067,7 +1067,7 @@ dependencies = [ [[package]] name = "burn-dataset" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "csv", "derive-new 0.7.0", @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "burn-derive" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "derive-new 0.7.0", "proc-macro2", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "burn-fusion" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-common", "burn-tensor", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "burn-hip" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-fusion", "burn-jit", @@ -1133,7 +1133,7 @@ dependencies = [ [[package]] name = "burn-jit" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-common", "burn-fusion", @@ -1155,7 +1155,7 @@ dependencies = [ [[package]] name = "burn-ndarray" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "atomic_float", "burn-autodiff", @@ -1174,7 +1174,7 @@ dependencies = [ [[package]] name = "burn-router" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-common", "burn-tensor", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "burn-tch" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-tensor", "half", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "burn-tensor" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-common", "bytemuck", @@ -1219,7 +1219,7 @@ dependencies = [ [[package]] name = "burn-train" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "async-channel", "burn-core", @@ -1240,7 +1240,7 @@ dependencies = [ [[package]] name = "burn-wgpu" version = "0.16.0" -source = "git+https://github.com/tracel-ai/burn#6dbc3fd295c8c84009f32c012f4161bd81106b73" +source = "git+https://github.com/tracel-ai/burn?rev=42e7c1f225a7c3e2be502e437fc417c5f61f2589#42e7c1f225a7c3e2be502e437fc417c5f61f2589" dependencies = [ "burn-fusion", "burn-jit", @@ -1923,7 +1923,7 @@ dependencies = [ [[package]] name = "cubecl" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "cubecl-core", "cubecl-cuda", @@ -1931,13 +1931,12 @@ dependencies = [ "cubecl-linalg", "cubecl-runtime", "cubecl-wgpu", - "half", ] [[package]] name = "cubecl-common" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "derive-new 0.6.0", "embassy-futures", @@ -1954,7 +1953,7 @@ dependencies = [ [[package]] name = "cubecl-core" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "bytemuck", "cubecl-common", @@ -1972,7 +1971,7 @@ dependencies = [ [[package]] name = "cubecl-cpp" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "bytemuck", "cubecl-common", @@ -1986,7 +1985,7 @@ dependencies = [ [[package]] name = "cubecl-cuda" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "bytemuck", "cubecl-common", @@ -2002,7 +2001,7 @@ dependencies = [ [[package]] name = "cubecl-hip" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "bytemuck", "cubecl-common", @@ -2013,7 +2012,6 @@ dependencies = [ "derive-new 0.6.0", "half", "log", - "paste", ] [[package]] @@ -2028,7 +2026,7 @@ dependencies = [ [[package]] name = "cubecl-linalg" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "bytemuck", "cubecl-core", @@ -2039,7 +2037,7 @@ dependencies = [ [[package]] name = "cubecl-macros" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "cubecl-common", "darling", @@ -2054,7 +2052,7 @@ dependencies = [ [[package]] name = "cubecl-runtime" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "async-channel", "async-lock", @@ -2075,7 +2073,7 @@ dependencies = [ [[package]] name = "cubecl-wgpu" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=1c4e0036c043422773fd6824c2a888160fca8e5e#1c4e0036c043422773fd6824c2a888160fca8e5e" +source = "git+https://github.com/tracel-ai/cubecl?rev=2c09d4dd1ecb9f474e524dc47b05599edb7049e7#2c09d4dd1ecb9f474e524dc47b05599edb7049e7" dependencies = [ "async-channel", "bytemuck", diff --git a/Cargo.toml b/Cargo.toml index 65343055..1986eab9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,12 +70,12 @@ burn = { git = "https://github.com/tracel-ai/burn", features = [ 'wgpu', 'autodiff', 'template', -] } -burn-jit = { git = "https://github.com/tracel-ai/burn" } +], rev = "42e7c1f225a7c3e2be502e437fc417c5f61f2589" } +burn-jit = { git = "https://github.com/tracel-ai/burn", rev = "42e7c1f225a7c3e2be502e437fc417c5f61f2589" } burn-wgpu = { git = "https://github.com/tracel-ai/burn", features = [ "exclusive-memory-only", -] } -burn-fusion = { git = "https://github.com/tracel-ai/burn" } +], rev = "42e7c1f225a7c3e2be502e437fc417c5f61f2589" } +burn-fusion = { git = "https://github.com/tracel-ai/burn", rev = "42e7c1f225a7c3e2be502e437fc417c5f61f2589" } egui = { git = "https://github.com/emilk/egui/", rev = "5bfff316c9818b3c140d02bb6cdc488556d46ab7" }