From 254d2ba49a3804c55e0c8133a20fc3b317b817a3 Mon Sep 17 00:00:00 2001 From: Yunsong Wang Date: Wed, 15 Jan 2025 10:19:43 -0800 Subject: [PATCH] Revert changes --- cpp/CMakeLists.txt | 5 ----- cpp/cmake/Modules/ConfigureCUDA.cmake | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index f67032b45ea..354560998c5 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -787,11 +787,6 @@ add_library( src/utilities/type_dispatcher.cpp ) -set_source_files_properties( - src/join/mixed_join_size_kernel.cu src/join/mixed_join_size_kernel_nulls.cu - PROPERTIES COMPILE_OPTIONS $<$:--expt-relaxed-constexpr> -) - # Anything that includes jitify needs to be compiled with _FILE_OFFSET_BITS=64 due to a limitation # in how conda builds glibc set_source_files_properties( diff --git a/cpp/cmake/Modules/ConfigureCUDA.cmake b/cpp/cmake/Modules/ConfigureCUDA.cmake index 48625a53494..f75b5aef7af 100644 --- a/cpp/cmake/Modules/ConfigureCUDA.cmake +++ b/cpp/cmake/Modules/ConfigureCUDA.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2018-2025, NVIDIA CORPORATION. +# Copyright (c) 2018-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -16,7 +16,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) list(APPEND CUDF_CXX_FLAGS -Wall -Werror -Wno-unknown-pragmas -Wno-error=deprecated-declarations) endif() -list(APPEND CUDF_CUDA_FLAGS --expt-extended-lambda) +list(APPEND CUDF_CUDA_FLAGS --expt-extended-lambda --expt-relaxed-constexpr) # set warnings as errors if(CUDA_WARNINGS_AS_ERRORS)