From 43257a557a8d9699716da575b229eb8f7187a8af Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Sun, 29 Oct 2023 11:43:01 +0800 Subject: [PATCH] Fix building cuda version of k2 on Windows --- k2/csrc/log.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/k2/csrc/log.h b/k2/csrc/log.h index 66d29c59a..c85cc6d40 100644 --- a/k2/csrc/log.h +++ b/k2/csrc/log.h @@ -83,12 +83,21 @@ enum class LogLevel { // K2_LOG(TRACE) << "some message"; // K2_LOG(DEBUG) << "some message"; // +#ifndef _MSC_VER constexpr LogLevel TRACE = LogLevel::kTrace; constexpr LogLevel DEBUG = LogLevel::kDebug; constexpr LogLevel INFO = LogLevel::kInfo; constexpr LogLevel WARNING = LogLevel::kWarning; constexpr LogLevel ERROR = LogLevel::kError; constexpr LogLevel FATAL = LogLevel::kFatal; +#else +#define TRACE LogLevel::kTrace +#define DEBUG LogLevel::kDebug +#define INFO LogLevel::kInfo +#define WARNING LogLevel::kWarning +#define ERROR LogLevel::kError +#define FATAL LogLevel::kFatal +#endif std::string GetStackTrace(); @@ -110,9 +119,8 @@ K2_CUDA_HOSTDEV LogLevel GetCurrentLogLevel(); inline bool EnableAbort() { static std::once_flag init_flag; static bool enable_abort = false; - std::call_once(init_flag, []() { - enable_abort = (std::getenv("K2_ABORT") != nullptr); - }); + std::call_once(init_flag, + []() { enable_abort = (std::getenv("K2_ABORT") != nullptr); }); return enable_abort; } @@ -274,7 +282,7 @@ class Logger { class Voidifier { public: - K2_CUDA_HOSTDEV void operator&(const Logger &)const {} + K2_CUDA_HOSTDEV void operator&(const Logger &) const {} }; inline bool EnableCudaDeviceSync() {