From 1f186f42b77e4cf9e04ff75c7f5748fce062ea0a Mon Sep 17 00:00:00 2001 From: Ayush Ojha Date: Fri, 27 Mar 2026 05:02:26 -0700 Subject: [PATCH] Update CUTLASS to fix matrix typo --- CMakeLists.txt | 6 ++++-- README.md | 2 +- dependencies/cutlass | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac9f2aab..b006e1bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,9 +73,10 @@ endif() if (MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:preprocessor") endif() -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -134,7 +135,7 @@ function(TCNN_AUTODETECT_CUDA_ARCHITECTURES OUT_VARIABLE) endif() endfunction() -set(CMAKE_CUDA_STANDARD 14) +set(CMAKE_CUDA_STANDARD 17) set(CMAKE_CUDA_STANDARD_REQUIRED ON) set(CMAKE_CUDA_EXTENSIONS OFF) set(CUDA_LINK_LIBRARIES_KEYWORD PUBLIC) @@ -278,6 +279,7 @@ endif() if (MSVC) list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=/bigobj") + list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=/Zc:preprocessor") else() list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-Wno-float-conversion") list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fno-strict-aliasing") diff --git a/README.md b/README.md index b524772f..706cc019 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ producing an image every couple of training steps. Each 1000 steps should take a ## Requirements - An __NVIDIA GPU__; tensor cores increase performance when available. All shown results come from an RTX 3090. -- A __C++14__ capable compiler. The following choices are recommended and have been tested: +- A __C++17__ capable compiler. The following choices are recommended and have been tested: - __Windows:__ Visual Studio 2019 or 2022 - __Linux:__ GCC/G++ 8 or higher - A recent version of __[CUDA](https://developer.nvidia.com/cuda-toolkit)__. The following choices are recommended and have been tested: diff --git a/dependencies/cutlass b/dependencies/cutlass index 1eb63551..82f50759 160000 --- a/dependencies/cutlass +++ b/dependencies/cutlass @@ -1 +1 @@ -Subproject commit 1eb6355182a5124639ce9d3ff165732a94ed9a70 +Subproject commit 82f5075946e2569589439d500733b700a3141374