From 850bdaa51fd3f76d3f725a6f6611389c30f784ae Mon Sep 17 00:00:00 2001 From: Keisuke Fukuda Date: Wed, 29 Oct 2025 21:20:18 +0000 Subject: [PATCH] Fix: Change C++ lang to 17 and use ifdef for _CCCL_EXEC_CHECK_DISABLE --- CMakeLists.txt | 4 ++-- dietgpu/ans/GpuANSEncode.cuh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22a201e..9147e29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,14 +6,14 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(dietgpu LANGUAGES CUDA CXX VERSION 1.0) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_STANDARD 11) include(CheckLanguage) check_language(CUDA) if(NOT DEFINED CMAKE_CUDA_STANDARD) - set(CMAKE_CUDA_STANDARD 14) + set(CMAKE_CUDA_STANDARD 17) set(CMAKE_CUDA_STANDARD_REQUIRED ON) endif() diff --git a/dietgpu/ans/GpuANSEncode.cuh b/dietgpu/ans/GpuANSEncode.cuh index 20dcb46..959b3d1 100644 --- a/dietgpu/ans/GpuANSEncode.cuh +++ b/dietgpu/ans/GpuANSEncode.cuh @@ -499,8 +499,9 @@ struct Align { typedef uint32_t argument_type; typedef uint32_t result_type; -#if (__CUDACC_VER_MAJOR__ < 12) || \ - (__CUDACC_VER_MAJOR__ == 12 && __CUDACC_VER_MINOR__ < 8) +#if defined(_CCCL_EXEC_CHECK_DISABLE) + _CCCL_EXEC_CHECK_DISABLE +#elif defined(__thrust_exec_check_disable__) __thrust_exec_check_disable__ #endif template