Skip to content

Commit e390415

Browse files
committed
ggml-zdnn: fix pr comments
Signed-off-by: Aaron Teo <[email protected]>
1 parent fb0241b commit e390415

File tree

3 files changed

+31
-695
lines changed

3 files changed

+31
-695
lines changed

ggml/src/ggml-zdnn/CMakeLists.txt

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
1-
if (GGML_ZDNN)
2-
if (DEFINED ZDNN_ROOT)
3-
message(STATUS "zdnn: using ZDNN_ROOT override: ${ZDNN_ROOT}")
4-
set(ZDNN_HINT "${ZDNN_ROOT}")
5-
else()
6-
set(ZDNN_HINT "")
7-
endif()
1+
if (DEFINED ZDNN_ROOT)
2+
message(STATUS "zdnn: using ZDNN_ROOT override: ${ZDNN_ROOT}")
3+
set(ZDNN_HINT "${ZDNN_ROOT}")
4+
else()
5+
set(ZDNN_HINT "")
6+
endif()
87

9-
find_path(ZDNN_INCLUDE
10-
NAMES zdnn.h
11-
HINTS ${ZDNN_HINT} /usr /usr/local
12-
PATH_SUFFIXES include)
13-
if (ZDNN_INCLUDE)
14-
message(STATUS "zdnn: found include: ${ZDNN_INCLUDE}")
15-
else()
16-
message(FATAL_ERROR "zdnn: include directory not found, please set ZDNN_ROOT to the proper path if necessary")
17-
endif()
8+
find_path(ZDNN_INCLUDE
9+
NAMES zdnn.h
10+
HINTS ${ZDNN_HINT} /usr /usr/local
11+
PATH_SUFFIXES include)
12+
if (ZDNN_INCLUDE)
13+
message(STATUS "zdnn: found include: ${ZDNN_INCLUDE}")
14+
else()
15+
message(FATAL_ERROR "zdnn: include directory not found, please set ZDNN_ROOT to the proper path if necessary")
16+
endif()
1817

19-
find_library(ZDNN_LIB
20-
NAMES zdnn
21-
HINTS ${ZDNN_HINT} /usr /usr/local
22-
PATH_SUFFIXES lib lib64)
23-
if (ZDNN_LIB)
24-
message(STATUS "zdnn: found library: ${ZDNN_LIB}")
25-
else()
26-
message(FATAL_ERROR "zdnn: library not found, please set ZDNN_ROOT to the proper path if necessary")
27-
endif()
18+
find_library(ZDNN_LIB
19+
NAMES zdnn
20+
HINTS ${ZDNN_HINT} /usr /usr/local
21+
PATH_SUFFIXES lib lib64)
22+
if (ZDNN_LIB)
23+
message(STATUS "zdnn: found library: ${ZDNN_LIB}")
24+
else()
25+
message(FATAL_ERROR "zdnn: library not found, please set ZDNN_ROOT to the proper path if necessary")
26+
endif()
2827

29-
file(GLOB GGML_SOURCES_ZDNN "*.c" "*.cpp")
30-
file(GLOB GGML_HEADERS_ZDNN "*.h" "*.hpp")
28+
file(GLOB GGML_SOURCES_ZDNN "*.c" "*.cpp")
29+
file(GLOB GGML_HEADERS_ZDNN "*.h" "*.hpp")
3130

32-
ggml_add_backend_library(ggml-zdnn ${GGML_HEADERS_ZDNN} ${GGML_SOURCES_ZDNN})
33-
target_link_libraries(ggml-zdnn PRIVATE ${ZDNN_LIB})
34-
target_include_directories(ggml-zdnn PRIVATE ${ZDNN_INCLUDE})
35-
target_link_directories(ggml-zdnn PRIVATE ${ZDNN_LIB})
31+
ggml_add_backend_library(ggml-zdnn ${GGML_HEADERS_ZDNN} ${GGML_SOURCES_ZDNN})
32+
target_link_libraries(ggml-zdnn PRIVATE ${ZDNN_LIB})
33+
target_include_directories(ggml-zdnn PRIVATE ${ZDNN_INCLUDE})
34+
target_link_directories(ggml-zdnn PRIVATE ${ZDNN_LIB})
3635

37-
target_compile_definitions(ggml-zdnn PRIVATE GGML_ZDNN GGML_USE_ZDNN)
38-
endif()
36+
target_compile_definitions(ggml-zdnn PRIVATE GGML_ZDNN GGML_USE_ZDNN)

ggml/src/ggml-zdnn/ggml-zdnn.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,6 @@ static bool ggml_zdnn_supports_op(const ggml_backend_zdnn_device_context * ctx_d
287287
default:
288288
return false;
289289
}
290-
291-
GGML_UNUSED(ctx_dev);
292290
}
293291

294292
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)