Skip to content

Commit 79d142f

Browse files
wooway777wooway777
committed
issue/889 - cxflags to cxxflags in compile scripts
1 parent 4ba239d commit 79d142f

12 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎xmake.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ end
1919
if is_plat("windows") then
2020
set_runtimes("MD")
2121
add_ldflags("/utf-8", {force = true})
22-
add_cxflags("/utf-8", {force = true})
22+
add_cxxflags("/utf-8", {force = true})
2323
end
2424

2525
-- CPU
@@ -218,14 +218,14 @@ target("infini-utils")
218218
set_warnings("all", "error")
219219

220220
if is_plat("windows") then
221-
add_cxflags("/wd4068")
221+
add_cxxflags("/wd4068")
222222
if has_config("omp") then
223-
add_cxflags("/openmp")
223+
add_cxxflags("/openmp")
224224
end
225225
else
226-
add_cxflags("-fPIC", "-Wno-unknown-pragmas")
226+
add_cxxflags("-fPIC", "-Wno-unknown-pragmas")
227227
if has_config("omp") then
228-
add_cxflags("-fopenmp")
228+
add_cxxflags("-fopenmp")
229229
add_ldflags("-fopenmp", {force = true})
230230
end
231231
end
@@ -269,7 +269,7 @@ target("infinirt")
269269
end
270270
set_languages("cxx17")
271271
if not is_plat("windows") then
272-
add_cxflags("-fPIC")
272+
add_cxxflags("-fPIC")
273273
end
274274
set_installdir(os.getenv("INFINI_ROOT") or (os.getenv(is_host("windows") and "HOMEPATH" or "HOME") .. "/.infini"))
275275
add_files("src/infinirt/*.cc")

‎xmake/ascend.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ target("infiniop-ascend")
4343
add_deps("infini-utils")
4444
on_install(function (target) end)
4545

46-
add_cxflags("-lstdc++ -fPIC")
46+
add_cxxflags("-lstdc++ -fPIC")
4747
set_warnings("all", "error")
4848

4949
set_languages("cxx17")
@@ -61,7 +61,7 @@ target("infinirt-ascend")
6161
add_deps("infini-utils")
6262
-- Add files
6363
add_files("$(projectdir)/src/infinirt/ascend/*.cc")
64-
add_cxflags("-lstdc++ -Wall -Werror -fPIC")
64+
add_cxxflags("-lstdc++ -Wall -Werror -fPIC")
6565
target_end()
6666

6767
target("infiniccl-ascend")
@@ -75,6 +75,6 @@ target("infiniccl-ascend")
7575
add_includedirs(ASCEND_HOME .. "/include/hccl")
7676
add_links("libhccl.so")
7777
add_files("../src/infiniccl/ascend/*.cc")
78-
add_cxflags("-lstdc++ -fPIC")
78+
add_cxxflags("-lstdc++ -fPIC")
7979
end
8080
target_end()

‎xmake/bang.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ target("infiniop-cambricon")
4040
add_deps("infini-utils")
4141
on_install(function (target) end)
4242

43-
add_cxflags("-lstdc++ -fPIC")
43+
add_cxxflags("-lstdc++ -fPIC")
4444
set_warnings("all", "error")
4545

4646
set_languages("cxx17")
@@ -58,7 +58,7 @@ target("infinirt-cambricon")
5858
on_install(function (target) end)
5959
-- Add include dirs
6060
add_files("../src/infinirt/bang/*.cc")
61-
add_cxflags("-lstdc++ -Wall -Werror -fPIC")
61+
add_cxxflags("-lstdc++ -Wall -Werror -fPIC")
6262
target_end()
6363

6464
target("infiniccl-cambricon")
@@ -88,7 +88,7 @@ target("infiniccl-cambricon")
8888
add_runenvs("LD_LIBRARY_PATH", NEUWARE_HOME .. "/lib64")
8989

9090
add_files("../src/infiniccl/cambricon/*.cc")
91-
add_cxflags("-fPIC")
91+
add_cxxflags("-fPIC")
9292
add_ldflags("-fPIC")
9393
else
9494
print("[Warning] CNCL is currently only supported on Linux")

‎xmake/cpu.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ target("infiniop-cpu")
66
set_warnings("all", "error")
77

88
if is_plat("windows") then
9-
add_cxflags("/wd4068")
9+
add_cxxflags("/wd4068")
1010
if has_config("omp") then
11-
add_cxflags("/openmp")
11+
add_cxxflags("/openmp")
1212
end
1313
else
14-
add_cxflags("-fPIC", "-Wno-unknown-pragmas")
14+
add_cxxflags("-fPIC", "-Wno-unknown-pragmas")
1515
if has_config("omp") then
16-
add_cxflags("-fopenmp")
16+
add_cxxflags("-fopenmp")
1717
add_ldflags("-fopenmp")
1818
end
1919
end
@@ -31,7 +31,7 @@ target("infinirt-cpu")
3131
set_warnings("all", "error")
3232

3333
if not is_plat("windows") then
34-
add_cxflags("-fPIC")
34+
add_cxxflags("-fPIC")
3535
end
3636

3737
set_languages("cxx17")

‎xmake/hygon.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ target("infiniop-hygon")
5959
add_cuflags("-Wno-return-type", {force = true}) -- 抑制return语句警告
6060
add_cuflags("-fPIC", "-std=c++17", {force = true})
6161
add_culdflags("-fPIC")
62-
add_cxflags("-fPIC")
62+
add_cxxflags("-fPIC")
6363

6464
-- 添加海光DCU特定的编译标志
6565
add_cuflags("-arch=gfx906", "-arch=gfx926", "-arch=gfx928", "-arch=gfx936")
@@ -76,7 +76,7 @@ target("infiniop-hygon")
7676
add_files("../src/infiniop/ops/swiglu/nvidia/*.cu")
7777

7878
if has_config("ninetoothed") then
79-
add_files("../build/ninetoothed/*.c", {cxflags = {"-Wno-return-type"}})
79+
add_files("../build/ninetoothed/*.c", {cxxflags = {"-Wno-return-type"}})
8080
end
8181
target_end()
8282

@@ -104,7 +104,7 @@ target("infinirt-hygon")
104104
add_cuflags("-Wno-return-type", {force = true}) -- 抑制return语句警告
105105
add_cuflags("-fPIC", "-std=c++17", {force = true})
106106
add_culdflags("-fPIC")
107-
add_cxflags("-fPIC")
107+
add_cxxflags("-fPIC")
108108

109109
-- 添加海光DCU特定的编译标志
110110
add_cuflags("-arch=gfx906", "-arch=gfx926", "-arch=gfx928", "-arch=gfx936")
@@ -137,7 +137,7 @@ target("infiniccl-hygon")
137137
add_cuflags("-Wno-return-type", {force = true}) -- 抑制return语句警告
138138
add_cuflags("-fPIC", "-std=c++17", {force = true})
139139
add_culdflags("-fPIC")
140-
add_cxflags("-fPIC")
140+
add_cxxflags("-fPIC")
141141

142142
-- 添加海光DCU特定的编译标志
143143
add_cuflags("-arch=gfx906", "-arch=gfx926", "-arch=gfx928", "-arch=gfx936")

‎xmake/iluvatar.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ target("infiniop-iluvatar")
4545
add_cuflags("-Wno-error=unused-private-field")
4646
add_cuflags("-fPIC", "-x", "ivcore", "-std=c++17", {force = true})
4747
add_culdflags("-fPIC")
48-
add_cxflags("-fPIC")
48+
add_cxxflags("-fPIC")
4949

5050
-- set_languages("cxx17") 天数似乎不能用这个配置
5151
add_files("../src/infiniop/devices/nvidia/*.cu", "../src/infiniop/ops/*/nvidia/*.cu")
@@ -54,7 +54,7 @@ target("infiniop-iluvatar")
5454
add_files("../src/infiniop/ops/dequantize_awq/iluvatar/*.cu")
5555

5656
if has_config("ninetoothed") then
57-
add_files("../build/ninetoothed/*.c", {cxflags = {"-Wno-return-type"}})
57+
add_files("../build/ninetoothed/*.c", {cxxflags = {"-Wno-return-type"}})
5858
end
5959
target_end()
6060

@@ -72,7 +72,7 @@ target("infinirt-iluvatar")
7272
set_warnings("all", "error")
7373
add_cuflags("-fPIC", "-x", "ivcore", "-std=c++17", {force = true})
7474
add_culdflags("-fPIC")
75-
add_cxflags("-fPIC")
75+
add_cxxflags("-fPIC")
7676

7777
-- set_languages("cxx17") 天数似乎不能用这个配置
7878
add_files("../src/infinirt/cuda/*.cu")
@@ -93,7 +93,7 @@ target("infiniccl-iluvatar")
9393
set_warnings("all", "error")
9494
add_cuflags("-fPIC", "-x", "ivcore", "-std=c++17", {force = true})
9595
add_culdflags("-fPIC")
96-
add_cxflags("-fPIC")
96+
add_cxxflags("-fPIC")
9797

9898
local nccl_root = os.getenv("NCCL_ROOT")
9999
if nccl_root then

‎xmake/kunlun.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ target("infiniop-kunlun")
7474
add_deps("infini-utils")
7575
on_install(function (target) end)
7676

77-
add_cxflags("-lstdc++ -fPIC -Wno-error=unused-function")
77+
add_cxxflags("-lstdc++ -fPIC -Wno-error=unused-function")
7878
set_warnings("all", "error")
7979

8080
set_languages("cxx17")
@@ -101,7 +101,7 @@ target("infinirt-kunlun")
101101
on_install(function (target) end)
102102
-- Add include dirs
103103
add_files("$(projectdir)/src/infinirt/kunlun/*.cc")
104-
add_cxflags("-lstdc++ -Wall -Werror -fPIC")
104+
add_cxxflags("-lstdc++ -Wall -Werror -fPIC")
105105
target_end()
106106

107107
target("infiniccl-kunlun")
@@ -116,6 +116,6 @@ target("infiniccl-kunlun")
116116
add_linkdirs(path.join(XCCL_DIR, "so"))
117117
add_links("bkcl")
118118
add_files("$(projectdir)/src/infiniccl/kunlun/*.cc")
119-
add_cxflags("-lstdc++ -fPIC")
119+
add_cxxflags("-lstdc++ -fPIC")
120120
end
121121
target_end()

‎xmake/metax.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ target("infiniop-metax")
4747
on_install(function (target) end)
4848
set_languages("cxx17")
4949
set_warnings("all", "error")
50-
add_cxflags("-lstdc++", "-fPIC", "-Wno-defaulted-function-deleted", "-Wno-strict-aliasing", {force = true})
50+
add_cxxflags("-lstdc++", "-fPIC", "-Wno-defaulted-function-deleted", "-Wno-strict-aliasing", {force = true})
5151
add_files("../src/infiniop/devices/metax/*.cc", "../src/infiniop/ops/*/metax/*.cc")
5252
add_files("../src/infiniop/ops/*/metax/*.maca", {rule = "maca"})
5353

5454
if has_config("ninetoothed") then
55-
add_files("../build/ninetoothed/*.c", {cxflags = {"-include stdlib.h", "-Wno-return-type"}})
55+
add_files("../build/ninetoothed/*.c", {cxxflags = {"-include stdlib.h", "-Wno-return-type"}})
5656
end
5757
target_end()
5858

@@ -62,7 +62,7 @@ target("infinirt-metax")
6262
on_install(function (target) end)
6363
add_deps("infini-utils")
6464
set_warnings("all", "error")
65-
add_cxflags("-lstdc++ -fPIC")
65+
add_cxxflags("-lstdc++ -fPIC")
6666
add_files("../src/infinirt/metax/*.cc")
6767
target_end()
6868

@@ -72,7 +72,7 @@ target("infiniccl-metax")
7272
on_install(function (target) end)
7373
set_warnings("all", "error")
7474
if not is_plat("windows") then
75-
add_cxflags("-fPIC")
75+
add_cxxflags("-fPIC")
7676
end
7777
if has_config("ccl") then
7878
if has_config("use-mc") then

‎xmake/moore.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ target("infiniop-moore")
4141
on_install(function (target) end)
4242
set_languages("cxx17")
4343
set_warnings("all", "error")
44-
add_cxflags("-lstdc++", "-fPIC", "-Wno-comment")
44+
add_cxxflags("-lstdc++", "-fPIC", "-Wno-comment")
4545
add_files("../src/infiniop/devices/moore/*.cc")
4646
add_files("../src/infiniop/ops/*/moore/*.mu", {rule = "mu"})
4747

@@ -55,7 +55,7 @@ target("infinirt-moore")
5555
on_install(function (target) end)
5656
add_deps("infini-utils")
5757
set_warnings("all", "error")
58-
add_cxflags("-lstdc++", "-fPIC")
58+
add_cxxflags("-lstdc++", "-fPIC")
5959
add_files("../src/infinirt/moore/*.cc")
6060
target_end()
6161

@@ -65,7 +65,7 @@ target("infiniccl-moore")
6565
on_install(function (target) end)
6666
set_warnings("all", "error")
6767
if not is_plat("windows") then
68-
add_cxflags("-fPIC")
68+
add_cxxflags("-fPIC")
6969
end
7070
if has_config("ccl") then
7171
add_links("libmccl.so")

‎xmake/nvidia.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ target("infinirt-nvidia")
9292
else
9393
add_cuflags("-Xcompiler=-fPIC")
9494
add_culdflags("-Xcompiler=-fPIC")
95-
add_cxflags("-fPIC")
95+
add_cxxflags("-fPIC")
9696
end
9797

9898
set_languages("cxx17")
@@ -111,7 +111,7 @@ target("infiniccl-nvidia")
111111
if not is_plat("windows") then
112112
add_cuflags("-Xcompiler=-fPIC")
113113
add_culdflags("-Xcompiler=-fPIC")
114-
add_cxflags("-fPIC")
114+
add_cxxflags("-fPIC")
115115

116116
local nccl_root = os.getenv("NCCL_ROOT")
117117
if nccl_root then

0 commit comments

Comments
 (0)