From 7300773b96b5f6324b0b9da624f0ed34de0c1326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Sun, 21 Jan 2024 17:47:56 +0100 Subject: [PATCH] deeptagger: give up on Windows altogether ORT requires MSVC to build. MSVC can't use MSYS2 libraries. CMake + clang-cl doesn't work in MSYS2. GraphicsMagick doesn't provide development packages for Windows. There is no getopt on Windows. --- deeptagger/README.adoc | 3 +-- deeptagger/deeptagger.cpp | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deeptagger/README.adoc b/deeptagger/README.adoc index 3eb62cd..c42d3f9 100644 --- a/deeptagger/README.adoc +++ b/deeptagger/README.adoc @@ -29,8 +29,7 @@ if you plan on using the GPU-enabled options. $ ./download.sh $ build/deeptagger models/deepdanbooru-v3-20211112-sgd-e28.model image.jpg -Very little effort is made to make the project compatible with non-POSIX -systems. +The project requires a POSIX-compatible system to build. Options ------- diff --git a/deeptagger/deeptagger.cpp b/deeptagger/deeptagger.cpp index 27b0a91..729eeac 100644 --- a/deeptagger/deeptagger.cpp +++ b/deeptagger/deeptagger.cpp @@ -116,7 +116,8 @@ read_config(Config &config, const char *path) } read_tags( - std::filesystem::path(path).replace_extension("tags"), config.tags); + std::filesystem::path(path).replace_extension("tags").string(), + config.tags); } // --- Data preparation -------------------------------------------------------- @@ -720,7 +721,7 @@ main(int argc, char *argv[]) // Load batched images in parallel (the first is for GM, the other for IM). if (g.batch > 1) { auto value = std::to_string( - std::max(std::thread::hardware_concurrency() / g.batch, 1L)); + std::max(long(std::thread::hardware_concurrency()) / g.batch, 1L)); setenv("OMP_NUM_THREADS", value.c_str(), true); setenv("MAGICK_THREAD_LIMIT", value.c_str(), true); }