Skip to content

Commit 455804e

Browse files
committed
refactor: 移除直接的昇腾支持,改为使用 infini-rt
Signed-off-by: YdrMaster <ydrml@hotmail.com>
1 parent 752db61 commit 455804e

File tree

8 files changed

+309
-316
lines changed

8 files changed

+309
-316
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ members = [
88
"models/llama/common",
99
"models/llama/common-cpu",
1010
"models/llama/opencl",
11+
"models/llama/infini",
1112
"models/llama/nvidia-gpu",
12-
"models/llama/ascend",
1313

1414
"models/clip/common",
1515
"models/clip/common-cpu",
@@ -28,8 +28,8 @@ itertools = "0.13"
2828
build-script-cfg = "0.0"
2929

3030
ndarray-layout = { git = "https://github.com/YdrMaster/ndarray-layout", rev = "f1fdd24" }
31-
operators = { git = "https://github.com/YdrMaster/operators-rs", rev = "8183a63", default-features = false }
31+
operators = { git = "https://github.com/YdrMaster/operators-rs", rev = "8c2227a", default-features = false }
3232

3333
search-cl-tools = { git = "https://github.com/InfiniTensor/clrt", rev = "6846d52" }
34+
search-infini-tools = { git = "https://github.com/InfiniTensor/infini-rt", rev = "136c30b" }
3435
search-cuda-tools = { git = "https://github.com/YdrMaster/cuda-driver", rev = "e2ec203" }
35-
search-ascend-tools = { git = "https://github.com/InfiniTensor/ascendcl", rev = "bca7489" }

models/llama/ascend/build.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

models/llama/ascend/src/lib.rs

Lines changed: 0 additions & 174 deletions
This file was deleted.

models/llama/ascend/src/test_infer.rs

Lines changed: 0 additions & 127 deletions
This file was deleted.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "llama-ascend"
2+
name = "llama-infini"
33
version = "0.0.0"
44
edition = "2021"
55
authors = ["YdrMaster <ydrml@hotmail.com>"]
@@ -8,11 +8,11 @@ authors = ["YdrMaster <ydrml@hotmail.com>"]
88

99
[dependencies]
1010
llama.path = "../common"
11-
operators = { workspace = true, features = ["ascend"] }
11+
operators = { workspace = true, features = ["infini"] }
1212

1313
[build-dependencies]
1414
build-script-cfg.workspace = true
15-
search-ascend-tools.workspace = true
15+
search-infini-tools.workspace = true
1616

1717
[dev-dependencies]
1818
test-utils.workspace = true

models/llama/infini/build.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
fn main() {
2+
use build_script_cfg::Cfg;
3+
use search_infini_tools::find_infini_rt;
4+
5+
let cfg = Cfg::new("src_detected");
6+
if find_infini_rt().is_some() {
7+
cfg.define();
8+
}
9+
}

0 commit comments

Comments
 (0)