Remove header file including for boost (#44052)

paddle/fluid/framework/feed_fetch_method.cc

@@ -14,7 +14,6 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/feed_fetch_method.h"
 
-#include <boost/variant.hpp>
 #include <string>
 
 #include "glog/logging.h"

paddle/fluid/framework/feed_fetch_type.h

@@ -19,7 +19,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/framework/lod_tensor_array.h"
 #include "paddle/fluid/framework/string_array.h"
-#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/ir/cost_model.h

@@ -27,7 +27,6 @@
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/platform/profiler.h"
 #include "paddle/fluid/platform/profiler/event_tracing.h"
-#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/ir/graph.h

@@ -25,7 +25,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/ir/node.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/utils/any.h"
 
 DECLARE_bool(convert_all_blocks);

paddle/fluid/framework/ir/pass.h

@@ -25,7 +25,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/ir/graph.h"
 #include "paddle/fluid/framework/ir/node.h"
 #include "paddle/fluid/framework/program_desc.h"
-#include "paddle/fluid/platform/variant.h"
+#include "paddle/phi/core/macros.h"
 #include "paddle/utils/any.h"
 
 namespace paddle {

paddle/fluid/framework/op_version_registry.h

@@ -22,6 +22,7 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_version_proto.h"
 #include "paddle/fluid/platform/enforce.h"
+#include "paddle/phi/core/macros.h"
 #include "paddle/utils/none.h"
 
 namespace paddle {

paddle/fluid/framework/operator.h

@@ -38,7 +38,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/unused_var_check.h"
 #include "paddle/fluid/memory/malloc.h"
 #include "paddle/fluid/platform/device_context.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/phi/core/compat/arg_map_context.h"
 #include "paddle/phi/core/compat/op_utils.h"
 #include "paddle/phi/core/kernel_factory.h"

paddle/fluid/framework/tuple.h

@@ -22,7 +22,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/tensor.h"
 #include "paddle/fluid/framework/var_desc.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/type_defs.h

@@ -23,7 +23,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/imperative/type_defs.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/utils/blank.h"
 #include "paddle/utils/small_vector.h"
 #include "paddle/utils/variant.h"

paddle/fluid/inference/analysis/argument.h

@@ -35,7 +35,7 @@
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/phi/common/data_type.h"
 
 namespace paddle {

paddle/fluid/memory/stats.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include "paddle/fluid/memory/stats.h"
 
 #include "paddle/fluid/memory/allocation/spin_lock.h"
-#include "paddle/fluid/platform/variant.h"
+#include "paddle/phi/core/macros.h"
 
 namespace paddle {
 namespace memory {

paddle/fluid/operators/controlflow/op_variant.h

@@ -18,7 +18,6 @@
 
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/program_desc.h"
-#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/operators/controlflow/recurrent_op_helper.h

@@ -23,7 +23,7 @@
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/operators/controlflow/op_variant.h"
 #include "paddle/fluid/operators/recurrent_op.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/fluid/string/string_helper.h"
 
 namespace paddle {

paddle/fluid/operators/controlflow/while_op_helper.h

@@ -20,7 +20,6 @@
 
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/operators/controlflow/op_variant.h"
-#include "paddle/fluid/platform/variant.h"
 
 namespace phi {
 class DenseTensor;

paddle/fluid/operators/jit/benchmark.cc

@@ -22,7 +22,6 @@
 #include "paddle/fluid/platform/device_tracer.h"
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/platform/variant.h"  // for UNUSED
 
 DEFINE_int32(burning, 10, "Burning times.");
 DEFINE_int32(repeat, 3000, "Repeat times.");

paddle/fluid/operators/jit/registry.h

@@ -22,7 +22,7 @@
 #include "paddle/fluid/operators/jit/kernel_base.h"
 #include "paddle/fluid/operators/jit/kernel_pool.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/platform/variant.h"  // for UNUSED
+#include "paddle/phi/core/macros.h"
 
 namespace paddle {
 namespace operators {

paddle/fluid/operators/math/matrix_bit_code.h

@@ -23,7 +23,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/selected_rows_utils.h"
 #include "paddle/fluid/framework/tensor.h"
 #include "paddle/fluid/platform/device_context.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/phi/kernels/funcs/blas/blas.h"
 
 #if defined(_WIN32)

paddle/fluid/platform/enforce.h

@@ -66,7 +66,7 @@ limitations under the License. */
 #include "glog/logging.h"
 #include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/platform/macros.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/fluid/string/printf.h"
 #include "paddle/fluid/string/to_string.h"
 #include "paddle/phi/backends/dynload/port.h"

paddle/fluid/platform/flags.h

@@ -21,7 +21,7 @@
 
 #include "gflags/gflags.h"
 #include "paddle/fluid/platform/macros.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/utils/variant.h"
 
 namespace paddle {

paddle/fluid/platform/monitor.h

@@ -26,6 +26,8 @@
 
 #include "glog/logging.h"
 
+#include "paddle/phi/core/macros.h"
+
 namespace paddle {
 namespace platform {
 

paddle/fluid/platform/place.h

@@ -18,7 +18,7 @@ limitations under the License. */
 // #include <vector>
 
 #include "paddle/fluid/platform/enforce.h"
-// #include "paddle/fluid/platform/variant.h"
+//
 #ifdef PADDLE_WITH_ASCEND_CL
 #include "paddle/fluid/platform/device/npu/enforce_npu.h"
 #endif

paddle/fluid/platform/variant.h

-/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
-
-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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-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. */
-
-#pragma once
-
-// Boost 1.41.0 requires __CUDACC_VER__, but in CUDA 9 __CUDACC_VER__
-// is removed, so we have to manually define __CUDACC_VER__ instead.
-// For details, please refer to
-// https://github.com/PaddlePaddle/Paddle/issues/6626
-#if defined(__CUDACC__) && defined(__CUDACC_VER_MAJOR__)
-#undef __CUDACC_VER__
-#define __CUDACC_VER__                                  \
-  __CUDACC_VER_BUILD__ + __CUDACC_VER_MAJOR__ * 10000 + \
-      __CUDACC_VER_MINOR__ * 100
-#endif
-
-#include "boost/config.hpp"
-
-// Because Boost 1.41.0's variadic templates has bug on nvcc, boost
-// will disable variadic template support in NVCC mode.  Define
-// BOOST_NO_CXX11_VARIADIC_TEMPLATES on gcc/clang to generate same
-// function symbols.  For details,
-// https://github.com/PaddlePaddle/Paddle/issues/3386
-#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#endif
-#endif
-
-#include <boost/mpl/comparison.hpp>
-#include <boost/mpl/less_equal.hpp>
-
-#include "paddle/utils/any.h"
-#include "paddle/utils/optional.h"
-
-// some platform-independent defintion
-#if defined(_WIN32)
-#define UNUSED
-#define __builtin_expect(EXP, C) (EXP)
-#else
-#define UNUSED __attribute__((unused))
-#endif

paddle/fluid/pybind/data_set_py.cc

@@ -35,7 +35,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/inference/io.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/fluid/pybind/data_set_py.h"
 
 namespace py = pybind11;

paddle/fluid/pybind/fleet_wrapper_py.cc

@@ -33,7 +33,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/inference/io.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/fluid/pybind/fleet_wrapper_py.h"
 
 namespace py = pybind11;

paddle/fluid/pybind/global_value_getter_setter.cc

@@ -27,6 +27,7 @@
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/platform/macros.h"
+#include "paddle/phi/core/macros.h"
 #include "pybind11/stl.h"
 
 // FIXME(zengjinle): these 2 flags may be removed by the linker when compiling

paddle/fluid/pybind/metrics_py.cc

@@ -27,7 +27,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/inference/io.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/fluid/pybind/metrics_py.h"
 
 namespace py = pybind11;

paddle/fluid/pybind/nccl_wrapper_py.cc

@@ -33,7 +33,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/inference/io.h"
 #include "paddle/fluid/platform/place.h"
-#include "paddle/fluid/platform/variant.h"
+
 #include "paddle/fluid/pybind/nccl_wrapper_py.h"
 
 namespace py = pybind11;

paddle/fluid/pybind/protobuf.h

@@ -22,7 +22,6 @@ typedef SSIZE_T ssize_t;
 #include <fstream>
 #include <vector>
 
-#include "paddle/fluid/platform/variant.h"
 #include "pybind11/numpy.h"
 #include "pybind11/pybind11.h"
 #include "pybind11/stl.h"

paddle/utils/tribool.h

@@ -18,6 +18,7 @@
 // 2. remove the depending boost header files
 // 3. remove the dummy_ in indeterminate_t, which is specially implemented for
 // Borland C++ Builder
+// 4. remove unnecessary macro BOOST_TRIBOOL_THIRD_STATE
 
 // Three-state boolean logic library
 
@@ -437,27 +438,3 @@ namespace paddle {
 using logic::indeterminate;
 using logic::tribool;
 }  // namespace paddle
-
-/**
- * \brief Declare a new name for the third state of a tribool
- *
- * Use this macro to declare a new name for the third state of a
- * tribool. This state can have any number of new names (in addition
- * to \c indeterminate), all of which will be equivalent. The new name will be
- * placed in the namespace in which the macro is expanded.
- *
- * Example:
- *   PADDLE_TRIBOOL_THIRD_STATE(true_or_false)
- *
- *   tribool x(true_or_false);
- *   // potentially set x
- *   if (true_or_false(x)) {
- *     // don't know what x is
- *   }
- */
-#define PADDLE_TRIBOOL_THIRD_STATE(Name)                          \
-  inline bool Name(boost::logic::tribool x,                       \
-                   boost::logic::detail::indeterminate_t dummy =  \
-                       boost::logic::detail::indeterminate_t()) { \
-    return x.value == boost::logic::tribool::indeterminate_value; \
-  }

python/paddle/fluid/tests/custom_kernel/custom_kernel_dot_c_setup.py

@@ -51,7 +51,6 @@ paddle_custom_kernel_include = [
 compile_third_party_path = os.path.join(os.environ['PADDLE_ROOT'],
                                         'build/third_party')
 paddle_custom_kernel_include += [
-    os.path.join(compile_third_party_path, 'boost/src/extern_boost'),  # boost
     os.path.join(compile_third_party_path, 'install/gflags/include'),  # gflags
     os.path.join(compile_third_party_path, 'install/glog/include'),  # glog
 ]

python/paddle/fluid/tests/custom_kernel/custom_kernel_dot_setup.py

@@ -53,7 +53,6 @@ paddle_custom_kernel_include = list(
 compile_third_party_path = os.path.join(os.environ['PADDLE_ROOT'],
                                         'build/third_party')
 paddle_custom_kernel_include += [
-    os.path.join(compile_third_party_path, 'boost/src/extern_boost'),  # boost
     os.path.join(compile_third_party_path, 'install/gflags/include'),  # gflags
     os.path.join(compile_third_party_path, 'install/glog/include'),  # glog
 ]

tools/prune_for_jetson.py

@@ -125,7 +125,7 @@ def append_fluid_kernels():
     with io.open(file_name, 'r', encoding='utf-8') as f:
         content = ''.join(f.readlines())
 
-    location_str = "nv_library(\n  tensorrt_op_teller\n  SRCS op_teller.cc\n  DEPS framework_proto device_context boost)"
+    location_str = "nv_library(\n  tensorrt_op_teller\n  SRCS op_teller.cc\n  DEPS framework_proto device_context)"
     new_content = content.replace(location_str, location_str + append_str)
 
     if new_content == content: