Skip to content

Commit aad25b4

Browse files
author
fmz
committed
Introduce ggml_compute_threadpool
- OpenMP functional: check - Vanilla ggml functional: Check - ggml w/threadpool functional: Check - OpenMP no regression: No glaring problems - Vanilla ggml no regression: No glaring problems - ggml w/threadpool no regression: No glaring problems
1 parent f19bf99 commit aad25b4

File tree

23 files changed

+1363
-280
lines changed

23 files changed

+1363
-280
lines changed

‎CMakePresets.json

Lines changed: 194 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,197 @@
11
{
2-
"version": 4,
3-
"configurePresets": [
4-
{
5-
"name": "base",
6-
"hidden": true,
7-
"generator": "Ninja",
8-
"binaryDir": "${sourceDir}/build-${presetName}",
9-
"cacheVariables": {
10-
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
11-
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
2+
"version": 4,
3+
"configurePresets": [
4+
{
5+
"name": "base",
6+
"hidden": true,
7+
"generator": "Ninja",
8+
"binaryDir": "${sourceDir}/build-${presetName}",
9+
"cacheVariables": {
10+
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
11+
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
12+
}
13+
},
14+
{
15+
"name": "sycl-base",
16+
"hidden": true,
17+
"generator": "Ninja",
18+
"binaryDir": "${sourceDir}/build-${presetName}",
19+
"cacheVariables": {
20+
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
21+
"CMAKE_CXX_COMPILER": "icx",
22+
"CMAKE_C_COMPILER": "cl",
23+
"GGML_SYCL": "ON",
24+
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
25+
}
26+
},
27+
{
28+
"name": "debug",
29+
"hidden": true,
30+
"cacheVariables": {
31+
"CMAKE_BUILD_TYPE": "Debug"
32+
}
33+
},
34+
{
35+
"name": "release",
36+
"hidden": true,
37+
"cacheVariables": {
38+
"CMAKE_BUILD_TYPE": "Release"
39+
}
40+
},
41+
{
42+
"name": "reldbg",
43+
"hidden": true,
44+
"cacheVariables": {
45+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
46+
}
47+
},
48+
{
49+
"name": "static",
50+
"hidden": true,
51+
"cacheVariables": {
52+
"GGML_STATIC": "ON"
53+
}
54+
},
55+
{
56+
"name": "arm64-windows-msvc",
57+
"hidden": true,
58+
"architecture": {
59+
"value": "arm64",
60+
"strategy": "external"
61+
},
62+
"toolset": {
63+
"value": "host=x86_64",
64+
"strategy": "external"
65+
},
66+
"cacheVariables": {
67+
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/arm64-windows-msvc.cmake"
68+
}
69+
},
70+
{
71+
"name": "arm64-windows-llvm",
72+
"hidden": true,
73+
"architecture": {
74+
"value": "arm64",
75+
"strategy": "external"
76+
},
77+
"toolset": {
78+
"value": "host=x86_64",
79+
"strategy": "external"
80+
},
81+
"cacheVariables": {
82+
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/arm64-windows-llvm.cmake"
83+
}
84+
},
85+
{
86+
"name": "arm64-windows-llvm-debug",
87+
"inherits": [
88+
"base",
89+
"arm64-windows-llvm",
90+
"debug"
91+
]
92+
},
93+
{
94+
"name": "arm64-windows-llvm-release",
95+
"inherits": [
96+
"base",
97+
"arm64-windows-llvm",
98+
"reldbg"
99+
]
100+
},
101+
{
102+
"name": "arm64-windows-llvm+static-release",
103+
"inherits": [
104+
"base",
105+
"arm64-windows-llvm",
106+
"reldbg",
107+
"static"
108+
]
109+
},
110+
{
111+
"name": "arm64-windows-msvc-debug",
112+
"inherits": [
113+
"base",
114+
"arm64-windows-msvc",
115+
"debug"
116+
]
117+
},
118+
{
119+
"name": "arm64-windows-msvc-release",
120+
"inherits": [
121+
"base",
122+
"arm64-windows-msvc",
123+
"reldbg"
124+
]
125+
},
126+
{
127+
"name": "arm64-windows-msvc+static-release",
128+
"inherits": [
129+
"base",
130+
"arm64-windows-msvc",
131+
"reldbg",
132+
"static"
133+
]
134+
},
135+
{
136+
"name": "x64-windows-msvc-debug",
137+
"inherits": [
138+
"base",
139+
"debug"
140+
]
141+
},
142+
{
143+
"name": "x64-windows-msvc-release",
144+
"inherits": [
145+
"base",
146+
"reldbg"
147+
]
148+
},
149+
{
150+
"name": "x64-windows-msvc+static-release",
151+
"inherits": [
152+
"base",
153+
"reldbg",
154+
"static"
155+
]
156+
},
157+
{
158+
"name": "x64-windows-sycl-debug",
159+
"inherits": [
160+
"sycl-base",
161+
"debug"
162+
]
163+
},
164+
{
165+
"name": "x64-windows-sycl-release",
166+
"inherits": [
167+
"sycl-base",
168+
"release"
169+
]
170+
},
171+
{
172+
"name": "clang10",
173+
"displayName": "Clang 10.0.0 x86_64-pc-linux-gnu",
174+
"description": "Using compilers: C = /usr/bin/clang, CXX = /usr/bin/clang++",
175+
"binaryDir": "${sourceDir}/out/build/${presetName}",
176+
"cacheVariables": {
177+
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
178+
"CMAKE_C_COMPILER": "/usr/bin/clang",
179+
"CMAKE_CXX_COMPILER": "/usr/bin/clang++",
180+
"CMAKE_RC_COMPILER": "/usr/bin/llvm-rc-10",
181+
"CMAKE_BUILD_TYPE": "Debug"
182+
}
183+
},
184+
{
185+
"name": "gcc8.4",
186+
"displayName": "GCC 8.4.0 x86_64-linux-gnu",
187+
"description": "Using compilers: C = /usr/bin/gcc, CXX = /usr/bin/g++",
188+
"binaryDir": "${sourceDir}/out/build/${presetName}",
189+
"cacheVariables": {
190+
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
191+
"CMAKE_C_COMPILER": "/usr/bin/gcc",
192+
"CMAKE_CXX_COMPILER": "/usr/bin/g++",
193+
"CMAKE_BUILD_TYPE": "Debug"
194+
}
12195
}
13-
},
14-
{
15-
"name": "sycl-base",
16-
"hidden": true,
17-
"generator": "Ninja",
18-
"binaryDir": "${sourceDir}/build-${presetName}",
19-
"cacheVariables": {
20-
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
21-
"CMAKE_CXX_COMPILER": "icx",
22-
"CMAKE_C_COMPILER": "cl",
23-
"GGML_SYCL": "ON",
24-
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
25-
}
26-
},
27-
{ "name": "debug", "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" } },
28-
{ "name": "release", "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } },
29-
{ "name": "reldbg", "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } },
30-
{ "name": "static", "hidden": true, "cacheVariables": { "GGML_STATIC": "ON" } },
31-
32-
{
33-
"name": "arm64-windows-msvc", "hidden": true,
34-
"architecture": { "value": "arm64", "strategy": "external" },
35-
"toolset": { "value": "host=x86_64", "strategy": "external" },
36-
"cacheVariables": {
37-
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/arm64-windows-msvc.cmake"
38-
}
39-
},
40-
41-
{
42-
"name": "arm64-windows-llvm", "hidden": true,
43-
"architecture": { "value": "arm64", "strategy": "external" },
44-
"toolset": { "value": "host=x86_64", "strategy": "external" },
45-
"cacheVariables": {
46-
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/arm64-windows-llvm.cmake"
47-
}
48-
},
49-
50-
{ "name": "arm64-windows-llvm-debug" , "inherits": [ "base", "arm64-windows-llvm", "debug" ] },
51-
{ "name": "arm64-windows-llvm-release", "inherits": [ "base", "arm64-windows-llvm", "reldbg" ] },
52-
{ "name": "arm64-windows-llvm+static-release", "inherits": [ "base", "arm64-windows-llvm", "reldbg", "static" ] },
53-
54-
{ "name": "arm64-windows-msvc-debug" , "inherits": [ "base", "arm64-windows-msvc", "debug" ] },
55-
{ "name": "arm64-windows-msvc-release", "inherits": [ "base", "arm64-windows-msvc", "reldbg" ] },
56-
{ "name": "arm64-windows-msvc+static-release", "inherits": [ "base", "arm64-windows-msvc", "reldbg", "static" ] },
57-
58-
{ "name": "x64-windows-msvc-debug" , "inherits": [ "base", "debug" ] },
59-
{ "name": "x64-windows-msvc-release", "inherits": [ "base", "reldbg" ] },
60-
{ "name": "x64-windows-msvc+static-release", "inherits": [ "base", "reldbg", "static" ] },
61-
62-
{ "name": "x64-windows-sycl-debug" , "inherits": [ "sycl-base", "debug" ] },
63-
{ "name": "x64-windows-sycl-release", "inherits": [ "sycl-base", "release" ] }
64-
]
196+
]
65197
}

0 commit comments

Comments
 (0)