diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7e27ab332..5ccba335b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -234,11 +234,22 @@ jobs: ci_cuda_example: runs-on: ubuntu-latest - container: ghcr.io/nlohmann/json-ci:v2.4.0 + strategy: + fail-fast: false + matrix: + # 11.8.0: newest pre-C++20 CUDA release, exercises the C++17 fallback + # path (tests/cuda_example/CMakeLists.txt picks the standard per nvcc + # version); 12.1.1: permanent regression guard for #3907 (nvcc 12.0/12.1 + # choke on enable_borrowed_range at C++20, fixed in 12.2); 12.6.3: recent + # CUDA/C++20 coverage. + cuda: ['11.8.0', '12.1.1', '12.6.3'] + container: nvidia/cuda:${{ matrix.cuda }}-devel-ubuntu22.04 steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false + - name: Get latest CMake and ninja + uses: lukka/get-cmake@f5b8fbb4d77cec1acc5a5f9f0df4beffaf5d98d9 # v4.3.4 - name: Run CMake run: cmake -S . -B build -DJSON_CI=On - name: Build diff --git a/cmake/ci.cmake b/cmake/ci.cmake index bc7f09d75..9cc850564 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -669,7 +669,6 @@ add_custom_target(ci_test_compiler_default add_custom_target(ci_cuda_example COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug -GNinja - -DCMAKE_CUDA_HOST_COMPILER=g++-8 -S${PROJECT_SOURCE_DIR}/tests/cuda_example -B${PROJECT_BINARY_DIR}/build_cuda_example COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_cuda_example ) diff --git a/docs/mkdocs/docs/community/quality_assurance.md b/docs/mkdocs/docs/community/quality_assurance.md index 1314e72a4..02ccccd9d 100644 --- a/docs/mkdocs/docs/community/quality_assurance.md +++ b/docs/mkdocs/docs/community/quality_assurance.md @@ -66,7 +66,9 @@ Note: Some modern features (like C++20 ranges or filesystem support) may be disa | Clang 20.1.1 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | | Clang 20.1.8 with GNU-like command-line | x86_64 | Windows Server 2022 (Build 20348) | GitHub | | Clang 21.1.8 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | - | CUDA 11.0.221 (nvcc) | x86_64 | Ubuntu 20.04 LTS | GitHub | + | CUDA 11.8.0 (nvcc) | x86_64 | Ubuntu 22.04 LTS | GitHub | + | CUDA 12.1.1 (nvcc) | x86_64 | Ubuntu 22.04 LTS | GitHub | + | CUDA 12.6.3 (nvcc) | x86_64 | Ubuntu 22.04 LTS | GitHub | | Emscripten 4.0.6 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | | GNU 4.8.5 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | | GNU 4.9.3 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 08c9fbc6c..4682fd361 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -146,6 +146,11 @@ #define JSON_HAS_RANGES 0 #elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000 #define JSON_HAS_RANGES 0 + // nvcc CUDA 12.0/12.1 chokes on the enable_borrowed_range variable-template + // syntax when compiling as CUDA source; fixed in CUDA 12.2 (issue #3907) + #elif defined(__CUDACC__) && defined(__CUDACC_VER_MAJOR__) && __CUDACC_VER_MAJOR__ == 12 \ + && defined(__CUDACC_VER_MINOR__) && (__CUDACC_VER_MINOR__ == 0 || __CUDACC_VER_MINOR__ == 1) + #define JSON_HAS_RANGES 0 #elif defined(__cpp_lib_ranges) #define JSON_HAS_RANGES 1 #else diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index a63e3326b..806b02ca9 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2520,6 +2520,11 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_HAS_RANGES 0 #elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000 #define JSON_HAS_RANGES 0 + // nvcc CUDA 12.0/12.1 chokes on the enable_borrowed_range variable-template + // syntax when compiling as CUDA source; fixed in CUDA 12.2 (issue #3907) + #elif defined(__CUDACC__) && defined(__CUDACC_VER_MAJOR__) && __CUDACC_VER_MAJOR__ == 12 \ + && defined(__CUDACC_VER_MINOR__) && (__CUDACC_VER_MINOR__ == 0 || __CUDACC_VER_MINOR__ == 1) + #define JSON_HAS_RANGES 0 #elif defined(__cpp_lib_ranges) #define JSON_HAS_RANGES 1 #else diff --git a/tests/cuda_example/CMakeLists.txt b/tests/cuda_example/CMakeLists.txt index 26b57f227..12f0fb4c2 100644 --- a/tests/cuda_example/CMakeLists.txt +++ b/tests/cuda_example/CMakeLists.txt @@ -3,7 +3,18 @@ project(json_cuda LANGUAGES CUDA) add_executable(json_cuda json_cuda.cu) target_include_directories(json_cuda PRIVATE ../../include) -target_compile_features(json_cuda PUBLIC cuda_std_11) + +# nvcc added C++20 support in CUDA 12.0 and C++17 in CUDA 11.0; pick the +# newest standard the detected compiler actually supports (see #3907) +# instead of hard-requiring one standard for every CUDA version. +if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) + set(json_cuda_std 20) +elseif(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0) + set(json_cuda_std 17) +else() + set(json_cuda_std 11) +endif() +target_compile_features(json_cuda PUBLIC cuda_std_${json_cuda_std}) set_target_properties(json_cuda PROPERTIES CUDA_EXTENSIONS OFF CUDA_STANDARD_REQUIRED ON diff --git a/tests/cuda_example/json_cuda.cu b/tests/cuda_example/json_cuda.cu index a27378aec..76d631fa4 100644 --- a/tests/cuda_example/json_cuda.cu +++ b/tests/cuda_example/json_cuda.cu @@ -16,4 +16,20 @@ int main() // regression for #3013 (ordered_json::reset() compile error with nvcc) nlohmann::ordered_json metadata; metadata.erase("key"); + + // exercise comparisons (operator==/operator<=>, gated by + // JSON_HAS_THREE_WAY_COMPARISON, independent of JSON_HAS_RANGES) and + // range-based iteration (exercises iteration_proxy/ranges machinery + // beyond just the enable_borrowed_range specialization) — see #3907 + nlohmann::json a = {1, 2, 3}; + nlohmann::json b = {1, 2, 3}; + static_cast(a == b); +#if JSON_HAS_THREE_WAY_COMPARISON + static_cast(a <=> b); // *NOPAD* + static_cast(a <=> 1); // *NOPAD* +#endif + for (const auto& element : a) + { + static_cast(element); + } }