vision.cpp: mmlab 배포 경로 완성 — 비정사각 러너 · 래퍼 규약 · 검증 하네스 결함 5건

.gitignore

@@ -1,4 +1,5 @@
 build
+build-*/
 install
 .vscode
 .vtune

CMakeLists.txt

@@ -12,6 +12,7 @@ option(VISP_INSTALL_MODELS "Download and install default models" ${VISP_PACKAGE}
 option(VISP_FMT_LIB "Use external fmt library instead of standard C++ <format>" OFF)
 option(VISP_STATIC_GGML "Force static build of ggml" OFF)
 option(VISP_ASAN "Enable AddressSanitizer" OFF)
+option(GGML_GTX "Build the GTX NPU ggml backend (depend/ggml-gtx)" OFF)
 
 include(GNUInstallDirs)
 set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
@@ -102,6 +103,13 @@ else()
   set(VISP_NO_WARNINGS -w)
 endif()
 
+# 설치본은 자기 위치 기준으로 라이브러리를 찾는다. ggml 을 포함한 모든 공유 라이브러리가
+# 같은 디렉터리에 설치되므로 $ORIGIN 하나면 되고, 이 값이 없으면 <prefix>/lib 가 로더
+# 검색 경로가 아닌 환경에서 실행이 `cannot open shared object file` 로 실패한다.
+if(NOT APPLE AND NOT WIN32)
+  set(CMAKE_INSTALL_RPATH "\$ORIGIN")
+endif()
+
 # Dependencies
 
 add_subdirectory(depend/stb)
@@ -143,6 +151,11 @@ endif()
 # 갈린다(`char name[GGML_MAX_NAME]` 이 구조체 레이아웃이다).
 
 add_subdirectory(depend/llama/ggml)
+# GTX NPU 백엔드는 depend/llama 밖(depend/ggml-gtx)에 둔다. depend/llama 가 upstream 태그를
+# 그대로 가리켜야 클론한 사람이 서브모듈을 받을 수 있다(g2c DECISIONS.md 「GGML_MAX_NAME」).
+if(GGML_GTX)
+  add_subdirectory(depend/ggml-gtx)
+endif()
 set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})
 
 # Vision.cpp libraries and executables
@@ -166,6 +179,10 @@ install(TARGETS visioncpp
   RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
   LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
   ARCHIVE DESTINATION ${VISP_LIB_INSTALL_DIR})
+
+# libvisioncpp 는 ggml 라이브러리와 같은 디렉터리에 설치된다. 그 자리를 자기 기준으로 찾게
+# 해야 <prefix>/lib 가 로더 검색 경로에 없는 환경에서도 열린다.
+set_target_properties(visioncpp PROPERTIES INSTALL_RPATH "\$ORIGIN")
 install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
 if(PROJECT_IS_TOP_LEVEL)
   install(FILES README.md LICENSE DESTINATION .)
@@ -176,9 +193,10 @@ endif()
 
 install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})
 
-if(VISP_CI OR VISP_DEV)
-  set_target_properties(vision-cli PROPERTIES INSTALL_RPATH "\$ORIGIN/../${VISP_LIB_INSTALL_DIR}")
-endif()
+# 설치본은 자기 위치 기준으로 라이브러리를 찾는다. 이 값이 없으면 CMake 가 RPATH 를 비워
+# 설치하고, <prefix>/lib 가 로더 검색 경로가 아닌 환경에서 실행이
+# `libvisioncpp.so.0: cannot open shared object file` 로 실패한다.
+set_target_properties(vision-cli PROPERTIES INSTALL_RPATH "\$ORIGIN/../${VISP_LIB_INSTALL_DIR}")
 
 install(DIRECTORY bindings/python DESTINATION . PATTERN "__pycache__" EXCLUDE)
 

README.md

@@ -23,9 +23,8 @@ New here? [**Getting started**](docs/getting-started.md) walks through a first r
 | [**Depth-Anything**](#depth-anything-v2) | Depth estimation         | CPU, Vulkan |
 | [**MI-GAN**](#mi-gan)                    | Inpainting               | CPU, Vulkan |
 | [**ESRGAN**](#real-esrgan)               | Super-resolution         | CPU, Vulkan |
-| [**YOLOv9t**](#yolov9t)                  | Object detection         | CPU         |
 | [**MMDetection** models](docs/mmdet-detectors.md) | Object detection, segmentation, tracking | CPU |
-| [**Compiled PyTorch models**](docs/mmdet-detectors.md#models-whose-head-survives-tracing) | Any traceable `nn.Module` — ultralytics YOLO, torchvision · needs the compiler, [GTX_Compiler](https://github.com/Sudo42b/GTX_Compiler), which carries this repository as a submodule | CPU |
+| [**Compiled PyTorch models**](docs/mmdet-detectors.md#models-whose-head-survives-tracing) | Any traceable `nn.Module`, e.g. torchvision · needs the compiler, [GTX_Compiler](https://github.com/Sudo42b/GTX_Compiler), which carries this repository as a submodule | CPU |
 | [_Implement a model [**Guide**]_](docs/model-implementation-guide.md) | | |
 
 **Backbones:** SWIN (v1), DINO (v2), TinyViT
@@ -136,17 +135,6 @@ vision-cli migan -m MIGAN-512-places2-F16.gguf -i image.png mask.png -o output.p
 vision-cli esrgan -m RealESRGAN-x4plus_anime-6B-F16.gguf -i input.png -o output.png
 ```
 
-#### YOLOv9t
-
-YOLOv9t object detection (anchor-free, DFL decode). The arch is self-contained
-(`ELAN1` / `RepNCSPELAN4` / `SPPELAN` blocks + detection head with `make_anchors`
-/ `dist2bbox` / DFL) and builds into `libvisioncpp`.
-
-[Paper (arXiv)](https://arxiv.org/abs/2402.13616) | [Repository (GitHub)](https://github.com/WongKinYiu/yolov9) | License: GPL-3.0
-
-Used via the library API (`visp::yolov9t::yolov9t_forward`) — no dedicated
-`vision-cli` subcommand yet. Weights are GGUF (`general.architecture = "yolov9t"`).
-
 Models need to be converted to GGUF before they can be used. This will also
 rearrange or precompute tensors for more optimal inference.
 

depend/ggml-gtx/CMakeLists.txt

@@ -0,0 +1,43 @@
+# GTX NPU backend for ggml.
+#
+# It lives here rather than inside depend/llama so that depend/llama can point at an
+# upstream tag without local patches. ggml's own registry does not know this backend,
+# so visp registers it at startup (load_ggml_backends in src/visp/ml.cpp).
+
+message(STATUS "Using GTX NPU backend")
+
+# ggml_add_backend_library 는 GGML_VERSION(_MAJOR) 로 so 버전을 붙인다. 그 변수는 ggml 폴더
+# 안에서만 정의되므로 ggml 타깃에 붙은 값을 가져온다.
+get_target_property(GGML_VERSION ggml VERSION)
+get_target_property(GGML_VERSION_MAJOR ggml SOVERSION)
+
+ggml_add_backend_library(ggml-gtx
+                         src/ggml-gtx.cpp
+                         src/pcie_irq_host.cpp
+                         )
+
+target_include_directories(ggml-gtx
+    PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}/include
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
+            ${CMAKE_SOURCE_DIR}/depend/llama/ggml/src) # ggml-impl.h, ggml-backend-impl.h
+
+# Consumers of ggml (visioncpp, vision-cli) see this and register the backend.
+target_compile_definitions(ggml-gtx PUBLIC GGML_USE_GTX)
+
+# GTX backend requires Windows (for PCIe driver) or Linux (for /dev/gtx*)
+if (WIN32)
+    # Windows: SetupAPI for device enumeration, could also need custom driver lib
+    target_link_libraries(ggml-gtx PRIVATE setupapi)
+    target_compile_definitions(ggml-gtx PRIVATE GGML_GTX_WINDOWS)
+elseif (UNIX AND NOT APPLE)
+    # Linux: mmap for BAR access
+    target_compile_definitions(ggml-gtx PRIVATE GGML_GTX_LINUX)
+else()
+    message(WARNING "GTX backend may not work on this platform: ${CMAKE_SYSTEM_NAME}")
+endif()
+
+# Shared library export definitions
+if (BUILD_SHARED_LIBS)
+    target_compile_definitions(ggml-gtx PRIVATE GGML_GTX_BUILD)
+    target_compile_definitions(ggml-gtx PUBLIC  GGML_GTX_SHARED)
+endif()