Skip to content

Commit 14147d6

Browse files
authored
build : fix build with clang-cl on Windows (#1284)
* build : fix building tests with clang-cl on Windows - clang-cl.exe (clang with MSVC CLI) doesn't like the space in /STACK option - cl.exe (MSVC) works either way * build : fix MSVC compiler warnings in test-roll.cpp
1 parent a70b4a7 commit 14147d6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

tests/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ if (NOT GGML_BACKEND_DL)
203203
add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
204204
target_link_libraries(${TEST_TARGET} PRIVATE ggml)
205205
if (MSVC)
206-
target_link_options(${TEST_TARGET} PRIVATE "/STACK: 8388608") # 8MB
206+
target_link_options(${TEST_TARGET} PRIVATE "/STACK:8388608") # 8MB
207207
endif()
208208
add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
209209
set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
@@ -215,7 +215,7 @@ if (NOT GGML_BACKEND_DL)
215215
add_executable(${TEST_TARGET} ${TEST_TARGET}.cpp)
216216
target_link_libraries(${TEST_TARGET} PRIVATE ggml Threads::Threads)
217217
if (MSVC)
218-
target_link_options(${TEST_TARGET} PRIVATE "/STACK: 8388608") # 8MB
218+
target_link_options(${TEST_TARGET} PRIVATE "/STACK:8388608") # 8MB
219219
endif()
220220
add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
221221
set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
@@ -227,7 +227,7 @@ if (NOT GGML_BACKEND_DL)
227227
add_executable(${TEST_TARGET} ${TEST_TARGET}.cpp)
228228
target_link_libraries(${TEST_TARGET} PRIVATE ggml)
229229
if (MSVC)
230-
target_link_options(${TEST_TARGET} PRIVATE "/STACK: 8388608") # 8MB
230+
target_link_options(${TEST_TARGET} PRIVATE "/STACK:8388608") # 8MB
231231
endif()
232232
add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
233233
set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")
@@ -286,7 +286,7 @@ if (NOT GGML_BACKEND_DL)
286286
add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
287287
target_link_libraries(${TEST_TARGET} PRIVATE ggml)
288288
if (MSVC)
289-
target_link_options(${TEST_TARGET} PRIVATE "/STACK: 8388608") # 8MB
289+
target_link_options(${TEST_TARGET} PRIVATE "/STACK:8388608") # 8MB
290290
endif()
291291
add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
292292
set_property(TEST ${TEST_TARGET} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${TEST_TARGET}.profraw")

tests/test-roll.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int64_t wrap(int64_t i, int64_t ne) {
2222
}
2323

2424
std::vector<float> roll_reference(
25-
const float * src, std::array<int64_t, 4> ne, std::array<int64_t, 4> shift) {
25+
const float * src, std::array<int64_t, 4> ne, std::array<int, 4> shift) {
2626

2727
const int64_t ne0 = ne[0], ne1 = ne[1], ne2 = ne[2], ne3 = ne[3];
2828
std::vector<float> dst(ne0 * ne1 * ne2 * ne3);
@@ -45,7 +45,7 @@ std::vector<float> roll_reference(
4545
return dst;
4646
}
4747

48-
std::vector<float> f32_range(int n) {
48+
std::vector<float> f32_range(int64_t n) {
4949
std::vector<float> values(n);
5050
std::iota(values.begin(), values.end(), 0.f);
5151
return values;
@@ -65,7 +65,7 @@ bool check_equal(const std::vector<float> & result, const std::vector<float> & e
6565
return true;
6666
}
6767

68-
bool test_roll(std::array<int64_t, 4> ne, std::array<int64_t, 4> shift, bool permute) {
68+
bool test_roll(std::array<int64_t, 4> ne, std::array<int, 4> shift, bool permute) {
6969
ggml_time_init();
7070

7171
ggml_init_params params {

0 commit comments

Comments
 (0)