Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/pkg-check.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
name: Package Check

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build package (static ggml)
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Build package archive
run: |
bash ./scripts/pkg-check/check-package.sh build \
--work-dir "$RUNNER_TEMP/pkg-check-build" \
--archive "$RUNNER_TEMP/pkg-check-build/visioncpp-package.tgz"

- name: Upload package archive
uses: actions/upload-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-build/visioncpp-package.tgz
if-no-files-found: error

check:
name: Verify package (consumer check)
runs-on: ubuntu-24.04
timeout-minutes: 30
needs: build

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake ninja-build

- name: Download package archive
uses: actions/download-artifact@v4
with:
name: visioncpp-package-linux
path: ${{ runner.temp }}/pkg-check-artifact

- name: Verify package from archive
run: |
bash ./scripts/pkg-check/check-package.sh check \
--work-dir "$RUNNER_TEMP/pkg-check-check" \
--from-archive "$RUNNER_TEMP/pkg-check-artifact/visioncpp-package.tgz"
31 changes: 26 additions & 5 deletions CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
cmake_minimum_required(VERSION 3.28)

project(vision.cpp VERSION 0.3.0 LANGUAGES CXX)
project(vision.cpp VERSION 0.3.1 LANGUAGES CXX)

option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(VISP_VULKAN "Enable Vulkan support" OFF)
option(VISP_DEV "Enable development mode" OFF)
option(VISP_CI "Enable for continuous integration environment" OFF)
option(VISP_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
option(VISP_INSTALL_MODELS "Download and install default models" OFF)
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)

include(GNUInstallDirs)
set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
if(VISP_INSTALL_MODELS)
set(VISP_MODEL_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/visioncpp" CACHE PATH "Directory to install default models to")
endif()

if(PROJECT_IS_TOP_LEVEL)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand DownExpand Up@@ -94,6 +104,15 @@ if(VISP_FMT_LIB)
list(APPEND VISP_DEFINITIONS VISP_FMT_LIB)
endif()

set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
if(VISP_STATIC_GGML)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(GGML_STATIC ON)
# Find shared libgomp before ggml finds a static version
# - undo https://github.com/ggml-org/llama.cpp/pull/16031
find_package(OpenMP)
endif()
set(GGML_VULKAN ${VISP_VULKAN})
set(GGML_LLAMAFILE ON)
if(VISP_CI)
Expand All@@ -110,6 +129,7 @@ if(VISP_CI)
endif()
endif()
add_subdirectory(depend/llama/ggml)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})

# Vision.cpp libraries and executables

Expand All@@ -121,15 +141,13 @@ add_subdirectory(src/cli)
if(VISP_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
if(VISP_TESTS OR VISP_INSTALL_MODELS)
add_subdirectory(models)
endif()

# Installation

set(VISP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
set(VISP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
set(VISP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

install(TARGETS visioncpp
RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${VISP_LIB_INSTALL_DIR}
Expand All@@ -138,6 +156,9 @@ install(DIRECTORY include/ DESTINATION ${VISP_INCLUDE_INSTALL_DIR})
if(PROJECT_IS_TOP_LEVEL)
install(FILES README.md LICENSE DESTINATION .)
endif()
if(VISP_INSTALL_MODELS)
install(FILES ${VISP_DEFAULT_MODELS} DESTINATION ${VISP_MODEL_INSTALL_DIR})
endif()

install(TARGETS vision-cli RUNTIME DESTINATION ${VISP_BIN_INSTALL_DIR})

Expand Down
62 changes: 34 additions & 28 deletions models/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
# Download models used in tests (happens only if VISP_TESTS is enabled)
# Download models used in tests or for installation

message(STATUS "Checking for models/MobileSAM-F16.gguf")
file(DOWNLOAD
function(download_model url filename hash)
message(STATUS "Checking for ${filename}")
file(DOWNLOAD
${url}
${CMAKE_CURRENT_LIST_DIR}/${filename}
EXPECTED_HASH ${hash}
SHOW_PROGRESS
)
set(DEFAULT_MODELS "${DEFAULT_MODELS};${CMAKE_CURRENT_LIST_DIR}/${filename}" PARENT_SCOPE)
endfunction()


download_model(
"https://huggingface.co/Acly/MobileSAM-GGUF/resolve/main/MobileSAM-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MobileSAM-F16.gguf
EXPECTED_HASH "SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
SHOW_PROGRESS
"MobileSAM-F16.gguf"
"SHA256=b546366475e3ad744bb2eaf7634df88e9aaf25f6622797d2de300f5a530831f7"
)
message(STATUS "Checking for models/BiRefNet-lite-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/BiRefNet-GGUF/resolve/main/BiRefNet-lite-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/BiRefNet-lite-F16.gguf
EXPECTED_HASH "SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
SHOW_PROGRESS
"BiRefNet-lite-F16.gguf"
"SHA256=7b5397a2c98d66677f8f74317774bbeac49dbb321b8a3dc744af913db71d4fa5"
)
message(STATUS "Checking for models/Depth-Anything-V2-Small-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/Depth-Anything-V2-GGUF/resolve/main/Depth-Anything-V2-Small-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/Depth-Anything-V2-Small-F16.gguf
EXPECTED_HASH "SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
SHOW_PROGRESS
"Depth-Anything-V2-Small-F16.gguf"
"SHA256=0f83332d6a8b4375cd7fdcc168f3e3636f474f8e84b0959e903f513aace782f5"
)
message(STATUS "Checking for models/MIGAN-512-places2-F16.gguf")
file(DOWNLOAD
download_model(
"https://huggingface.co/Acly/MIGAN-GGUF/resolve/main/MIGAN-512-places2-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/MIGAN-512-places2-F16.gguf
EXPECTED_HASH "SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
SHOW_PROGRESS
"MIGAN-512-places2-F16.gguf"
"SHA256=3e47592bf716d0dc306f8dc02d4476cfcdaf2c055fa3c3c8e0ced4db775eb64b"
)
message(STATUS "Checking for models/RealESRGAN-x4plus_anime-6B-F16.gguf")
file(DOWNLOAD
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
${CMAKE_CURRENT_LIST_DIR}/RealESRGAN-x4plus_anime-6B-F16.gguf
EXPECTED_HASH "SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
SHOW_PROGRESS
)
if(VISP_TESTS)
download_model(
"https://huggingface.co/Acly/Real-ESRGAN-GGUF/resolve/main/RealESRGAN-x4plus_anime-6B-F16.gguf"
"RealESRGAN-x4plus_anime-6B-F16.gguf"
"SHA256=730469c5a2269cdef96d0d58aacf87bcf25d7a0d92256685808e6cdce0675c09"
)
endif()

set(VISP_DEFAULT_MODELS "${DEFAULT_MODELS}" PARENT_SCOPE)
1 change: 1 addition & 0 deletions scripts/cmake/visioncpp-config.cmake.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
set_and_check(VISP_INCLUDE_DIR "@PACKAGE_VISP_INCLUDE_INSTALL_DIR@")
set_and_check(VISP_LIB_DIR "@PACKAGE_VISP_LIB_INSTALL_DIR@")

include(CMakeFindDependencyMacro)
find_dependency(ggml)

find_library(VISP_LIBRARY visioncpp REQUIRED HINTS ${VISP_LIB_DIR} NO_CMAKE_FIND_ROOT_PATH)
Expand Down
9 changes: 9 additions & 0 deletions scripts/pkg-check/CMakeLists.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 3.28)

project(visioncpp_pkg_check LANGUAGES C CXX)

find_package(visioncpp CONFIG REQUIRED)

add_executable(pkg-check main.cpp)
target_link_libraries(pkg-check PRIVATE visioncpp)
set_target_properties(pkg-check PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:visioncpp>")
Loading