Merge pull request #515 from julcst/fix-fmt

Tom94 · web-flow · commit 68d4f0f1f81f · 2025-09-09T10:02:32.000+09:00
Fix fmt compilation in C++20
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -285,7 +285,9 @@ set(BUILD_SHARED_LIBS OFF)
 
 if (TCNN_EXTERNAL_FMT)
 	list(APPEND TCNN_LIBRARIES "${TCNN_EXTERNAL_FMT}")
+	list(APPEND TCNN_DEFINITIONS -DFMT_UNICODE=0)
 else()
+	set(FMT_UNICODE OFF CACHE BOOL " " FORCE)
 	add_subdirectory("dependencies/fmt")
 	list(APPEND TCNN_LIBRARIES fmt)
 	list(APPEND TCNN_INCLUDES "dependencies/fmt/include")
diff --git a/dependencies/fmt b/dependencies/fmt
@@ -1 +1 @@
-Subproject commit b0c8263cb26ea178d3a5df1b984e1a61ef578950
+Subproject commit add164f6b3f5deb800443b87ba812fb19ad7cd5b
diff --git a/include/tiny-cuda-nn/common_host.h b/include/tiny-cuda-nn/common_host.h
@@ -56,7 +56,7 @@ void set_log_callback(const std::function<void(LogSeverity, const std::string&)>
 
 template <typename... Ts>
 void log(LogSeverity severity, const std::string& msg, Ts&&... args) {
-	log_callback()(severity, fmt::format(msg, std::forward<Ts>(args)...));
+	log_callback()(severity, fmt::format(fmt::runtime(msg), std::forward<Ts>(args)...));
 }
 
 template <typename... Ts> void log_info(const std::string& msg, Ts&&... args) { log(LogSeverity::Info, msg, std::forward<Ts>(args)...); }
@@ -304,7 +304,7 @@ std::string dfmt(uint32_t indent, const std::string& format, Ts&&... args) {
 		}
 	}
 
-	return fmt::format(join(lines, "\n"), std::forward<Ts>(args)...);
+	return fmt::format(fmt::runtime(join(lines, "\n")), std::forward<Ts>(args)...);
 }
 
 std::string to_lower(std::string str);

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ void set_log_callback(const std::function<void(LogSeverity, const std::string&)>`
`56`	`56`
`57`	`57`	`template <typename... Ts>`
`58`	`58`	`void log(LogSeverity severity, const std::string& msg, Ts&&... args) {`
`59`		`- log_callback()(severity, fmt::format(msg, std::forward<Ts>(args)...));`
	`59`	`+ log_callback()(severity, fmt::format(fmt::runtime(msg), std::forward<Ts>(args)...));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`template <typename... Ts> void log_info(const std::string& msg, Ts&&... args) { log(LogSeverity::Info, msg, std::forward<Ts>(args)...); }`
`@@ -304,7 +304,7 @@ std::string dfmt(uint32_t indent, const std::string& format, Ts&&... args) {`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`- return fmt::format(join(lines, "\n"), std::forward<Ts>(args)...);`
	`307`	`+ return fmt::format(fmt::runtime(join(lines, "\n")), std::forward<Ts>(args)...);`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`std::string to_lower(std::string str);`