PaddlePaddle · risemeup1 · Feb 28, 2025 · Feb 26, 2025 · Feb 26, 2025 · Feb 26, 2025
diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake
@@ -14,6 +14,8 @@
 
 include(ExternalProject)
 
+add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES)
+
 set(GLOG_PREFIX_DIR ${THIRD_PARTY_PATH}/glog)
 set(GLOG_INSTALL_DIR ${THIRD_PARTY_PATH}/install/glog)
 set(GLOG_INCLUDE_DIR

diff --git a/paddle/common/enforce.h b/paddle/common/enforce.h
@@ -37,8 +37,6 @@
 #include <execinfo.h>
 #endif
 
-// msvc conflict logging with windows.h
-#define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "paddle/utils/string/printf.h"
 #include "paddle/utils/string/to_string.h"
 #include "paddle/utils/variant.h"

diff --git a/paddle/fluid/framework/io/shell.cc b/paddle/fluid/framework/io/shell.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include <array>
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
+
 #include "paddle/fluid/framework/io/shell.h"
 
 #include "paddle/common/enforce.h"

diff --git a/paddle/fluid/framework/op_registry.h b/paddle/fluid/framework/op_registry.h
@@ -24,8 +24,7 @@ limitations under the License. */
 #include <unordered_map>
 #include <unordered_set>
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
-#include "glog/logging.h"               // For VLOG()
+#include "glog/logging.h"  // For VLOG()
 #include "paddle/common/flags.h"
 #include "paddle/common/macros.h"
 #include "paddle/fluid/framework/attribute.h"

diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
@@ -59,7 +59,6 @@ limitations under the License. */
 #include <execinfo.h>
 #endif
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include "glog/logging.h"
 #include "paddle/common/errors.h"
 #include "paddle/common/flags.h"

diff --git a/paddle/phi/common/port.h b/paddle/phi/common/port.h
@@ -17,8 +17,6 @@
 #include <string>
 #include "paddle/utils/test_macros.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
-
 #if !defined(_WIN32)
 #include <dlfcn.h>  // dladdr
 #include <sys/time.h>

diff --git a/paddle/phi/core/memory/allocation/system_allocator.cc b/paddle/phi/core/memory/allocation/system_allocator.cc
@@ -11,7 +11,6 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
-#define GLOG_NO_ABBREVIATED_SEVERITIES
 
 #include "paddle/phi/core/memory/allocation/system_allocator.h"
 

diff --git a/paddle/phi/core/platform/profiler/cpu_utilization.cc b/paddle/phi/core/platform/profiler/cpu_utilization.cc
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include "paddle/phi/core/platform/profiler/cpu_utilization.h"
 #include <array>
 #include "glog/logging.h"

diff --git a/paddle/phi/kernels/funcs/shuffle_batch.cu.h b/paddle/phi/kernels/funcs/shuffle_batch.cu.h
@@ -149,8 +149,9 @@ struct write_output_op_fixed {
   std::uint64_t m;
   InputIterT in;
   OutputIterT out;
-  // flag contains inclusive scan of valid keys
-  // perform gather using valid keys
+// flag contains inclusive scan of valid keys
+// perform gather using valid keys
+#if CUDA_VERSION < 12060
   __thrust_exec_check_disable__ __host__ __device__ std::size_t operator()(
       key_flag_tuple_fixed x) {
     if (x.key < m) {
@@ -159,6 +160,16 @@ struct write_output_op_fixed {
     }
     return 0;  // Discarded
   }
+#else
+  _CCCL_EXEC_CHECK_DISABLE
+  _CCCL_HOST_DEVICE std::size_t operator()(key_flag_tuple_fixed x) {
+    if (x.key < m) {
+      // -1 because inclusive scan
+      out[x.flag - 1] = in[x.key];
+    }
+    return 0;  // Discarded
+  }
+#endif
 };
 
 template <typename ExecutionPolicy,

diff --git a/test/cpp/fluid/platform/bfloat16_test.cc b/test/cpp/fluid/platform/bfloat16_test.cc
@@ -13,7 +13,6 @@ limitations under the License. */
 
 #include "paddle/phi/kernels/funcs/eigen/extensions.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include "gtest/gtest.h"
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/platform/enforce.h"

diff --git a/test/cpp/fluid/platform/bfloat16_test.cu b/test/cpp/fluid/platform/bfloat16_test.cu
@@ -14,7 +14,6 @@ limitations under the License. */
 
 #include "paddle/phi/common/bfloat16.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 

diff --git a/test/cpp/fluid/platform/complex_test.cc b/test/cpp/fluid/platform/complex_test.cc
@@ -18,7 +18,6 @@
 
 #include "paddle/phi/kernels/funcs/eigen/extensions.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include "gtest/gtest.h"
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/platform/enforce.h"

diff --git a/test/cpp/fluid/platform/complex_test.cu b/test/cpp/fluid/platform/complex_test.cu
@@ -14,7 +14,6 @@
 
 #include "paddle/phi/common/complex.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 #include <thrust/complex.h>

diff --git a/test/cpp/fluid/platform/device/gpu/cuda/cudnn_helper_test.cc b/test/cpp/fluid/platform/device/gpu/cuda/cudnn_helper_test.cc
@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES
 #define GOOGLE_GLOG_DLL_DECL
 
 #include <gtest/gtest.h>

diff --git a/test/cpp/fluid/platform/device/gpu/rocm/miopen_helper_test.cc b/test/cpp/fluid/platform/device/gpu/rocm/miopen_helper_test.cc
@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES
 #define GOOGLE_GLOG_DLL_DECL
 
 #include <gtest/gtest.h>

diff --git a/test/cpp/fluid/platform/float16_test.cc b/test/cpp/fluid/platform/float16_test.cc
@@ -11,7 +11,6 @@ limitations under the License. */
 
 #include "paddle/phi/common/float16.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include "gtest/gtest.h"
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/platform/enforce.h"

diff --git a/test/cpp/fluid/platform/float16_test.cu b/test/cpp/fluid/platform/float16_test.cu
@@ -11,7 +11,6 @@ limitations under the License. */
 
 #include "paddle/phi/common/float16.h"
 
-#define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 

diff --git a/test/cpp/inference/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc b/test/cpp/inference/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc
@@ -19,7 +19,7 @@ limitations under the License. */
 #include <io.h>
 #include <process.h>
 #endif
-#define GLOG_NO_ABBREVIATED_SEVERITIES
+
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 

diff --git a/test/cpp/inference/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc b/test/cpp/inference/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc
@@ -19,7 +19,7 @@ limitations under the License. */
 #include <io.h>
 #include <process.h>
 #endif
-#define GLOG_NO_ABBREVIATED_SEVERITIES
+
 #include <glog/logging.h>
 #include <gtest/gtest.h>