From c5dbcc8c232452415f3a0424efa51e9dcca0ac4f Mon Sep 17 00:00:00 2001 From: Ruibiao Chen Date: Mon, 4 Jul 2022 11:07:00 +0800 Subject: [PATCH] Remove boost::tribool (#44030) --- .../mkldnn/mkldnn_conv_bn_fuse_pass_tester.cc | 6 +- .../ir/mkldnn/mkldnn_inplace_pass_tester.cc | 8 +- .../ir/mkldnn/mkldnn_placement_pass_tester.cc | 10 +- paddle/utils/tribool.h | 463 ++++++++++++++++++ 4 files changed, 475 insertions(+), 12 deletions(-) create mode 100644 paddle/utils/tribool.h diff --git a/paddle/fluid/framework/ir/mkldnn/mkldnn_conv_bn_fuse_pass_tester.cc b/paddle/fluid/framework/ir/mkldnn/mkldnn_conv_bn_fuse_pass_tester.cc index a2b66263aa7..6f7bb614cc7 100644 --- a/paddle/fluid/framework/ir/mkldnn/mkldnn_conv_bn_fuse_pass_tester.cc +++ b/paddle/fluid/framework/ir/mkldnn/mkldnn_conv_bn_fuse_pass_tester.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include #include #include +#include "paddle/utils/tribool.h" #include "gtest/gtest.h" #include "paddle/fluid/framework/ir/graph_traits.h" @@ -52,12 +52,12 @@ class MKLDNNConvBatchNormPassTest { const std::string& name, const std::vector& inputs, const std::vector& outputs, - boost::tribool use_mkldnn) { + paddle::tribool use_mkldnn) { auto* op = prog->MutableBlock(0)->AppendOp(); op->SetType(type); - if (!boost::indeterminate(use_mkldnn)) + if (!paddle::indeterminate(use_mkldnn)) op->SetAttr("use_mkldnn", use_mkldnn); if (type == "conv2d_transpose") { diff --git a/paddle/fluid/framework/ir/mkldnn/mkldnn_inplace_pass_tester.cc b/paddle/fluid/framework/ir/mkldnn/mkldnn_inplace_pass_tester.cc index f6d318f74fe..a3b1f730dfc 100644 --- a/paddle/fluid/framework/ir/mkldnn/mkldnn_inplace_pass_tester.cc +++ b/paddle/fluid/framework/ir/mkldnn/mkldnn_inplace_pass_tester.cc @@ -14,8 +14,8 @@ #include -#include #include +#include "paddle/utils/tribool.h" #include "paddle/fluid/framework/ir/mkldnn/mkldnn_inplace_pass.h" #include "paddle/fluid/framework/ir/pass_tester_helper.h" @@ -44,12 +44,12 @@ class MKLDNNInplacePassTest { const std::string& name, const std::vector& inputs, const std::vector& outputs, - boost::tribool use_mkldnn) { + paddle::tribool use_mkldnn) { auto* op = prog->MutableBlock(0)->AppendOp(); op->SetType(type); - if (!boost::indeterminate(use_mkldnn)) + if (!paddle::indeterminate(use_mkldnn)) op->SetAttr("use_mkldnn", use_mkldnn); if (type == "conv2d") { @@ -102,7 +102,7 @@ class MKLDNNInplacePassTest { "conv1", std::vector({"a", "weights", "bias"}), std::vector({"f"}), - boost::indeterminate); + paddle::indeterminate); SetOp(&prog, "relu", "relu1", diff --git a/paddle/fluid/framework/ir/mkldnn/mkldnn_placement_pass_tester.cc b/paddle/fluid/framework/ir/mkldnn/mkldnn_placement_pass_tester.cc index bb38e6e9091..b9c1954dc74 100644 --- a/paddle/fluid/framework/ir/mkldnn/mkldnn_placement_pass_tester.cc +++ b/paddle/fluid/framework/ir/mkldnn/mkldnn_placement_pass_tester.cc @@ -14,7 +14,7 @@ #include -#include +#include "paddle/utils/tribool.h" #include "paddle/fluid/framework/ir/mkldnn/mkldnn_placement_pass.h" @@ -29,12 +29,12 @@ class PlacementPassTest { const std::string& name, const std::vector& inputs, const std::vector& outputs, - boost::tribool use_mkldnn) { + paddle::tribool use_mkldnn) { auto* op = prog->MutableBlock(0)->AppendOp(); op->SetType(type); - if (!boost::indeterminate(use_mkldnn)) + if (!paddle::indeterminate(use_mkldnn)) op->SetAttr("use_mkldnn", use_mkldnn); if (type == "conv2d") { @@ -90,13 +90,13 @@ class PlacementPassTest { "concat1", std::vector({"a", "b"}), std::vector({"c"}), - boost::indeterminate); + paddle::indeterminate); SetOp(&prog, "conv2d", "conv1", std::vector({"c", "weights", "bias"}), std::vector({"f"}), - boost::indeterminate); + paddle::indeterminate); SetOp(&prog, "relu", "relu1", diff --git a/paddle/utils/tribool.h b/paddle/utils/tribool.h new file mode 100644 index 00000000000..98a5019d715 --- /dev/null +++ b/paddle/utils/tribool.h @@ -0,0 +1,463 @@ +// Copyright (c) 2022 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. + +// This file copy from boost/logic/tribool.hpp, boost version: 1.41.0 +// Modified the following points: +// 1. modify namespace from boost to paddle +// 2. remove the depending boost header files +// 3. remove the dummy_ in indeterminate_t, which is specially implemented for +// Borland C++ Builder + +// Three-state boolean logic library + +// Copyright Douglas Gregor 2002-2004. Use, modification and +// distribution is subject to the Boost Software License, Version +// 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +// For more information, see http://www.boost.org + +#pragma once + +namespace paddle { +namespace logic { + +/// INTERNAL ONLY +namespace detail { +/** + * INTERNAL ONLY + * + * \brief A type used only to uniquely identify the 'indeterminate' + * function/keyword. + */ +struct indeterminate_t {}; + +} // end namespace detail + +class tribool; + +/** + * INTERNAL ONLY + * The type of the 'indeterminate' keyword. This has the same type as the + * function 'indeterminate' so that we can recognize when the keyword is + * used. + */ +typedef bool (*indeterminate_keyword_t)(tribool, detail::indeterminate_t); + +/** + * \brief Keyword and test function for the indeterminate tribool value + * + * The \c indeterminate function has a dual role. It's first role is + * as a unary function that tells whether the tribool value is in the + * "indeterminate" state. It's second role is as a keyword + * representing the indeterminate (just like "true" and "false" + * represent the true and false states). If you do not like the name + * "indeterminate", and would prefer to use a different name, see the + * macro \c BOOST_TRIBOOL_THIRD_STATE. + * + * \returns x.value == tribool::indeterminate_value + * \throws nothrow + */ +inline bool indeterminate( + tribool x, detail::indeterminate_t dummy = detail::indeterminate_t()); + +/** + * \brief A 3-state boolean type. + * + * 3-state boolean values are either true, false, or + * indeterminate. + */ +class tribool { + private: + /// INTERNAL ONLY + struct dummy { + void nonnull() {} + }; + + typedef void (dummy::*safe_bool)(); + + public: + /** + * Construct a new 3-state boolean value with the value 'false'. + * + * \throws nothrow + */ + tribool() : value(false_value) {} + + /** + * Construct a new 3-state boolean value with the given boolean + * value, which may be \c true or \c false. + * + * \throws nothrow + */ + tribool(bool value) : value(value ? true_value : false_value) {} // NOLINT + + /** + * Construct a new 3-state boolean value with an indeterminate value. + * + * \throws nothrow + */ + tribool(indeterminate_keyword_t) : value(indeterminate_value) {} // NOLINT + + /** + * Use a 3-state boolean in a boolean context. Will evaluate true in a + * boolean context only when the 3-state boolean is definitely true. + * + * \returns true if the 3-state boolean is true, false otherwise + * \throws nothrow + */ + operator safe_bool() const { + return value == true_value ? &dummy::nonnull : 0; + } + + /** + * The actual stored value in this 3-state boolean, which may be false, true, + * or indeterminate. + */ + enum value_t { false_value, true_value, indeterminate_value } value; +}; + +// Check if the given tribool has an indeterminate value. Also doubles as a +// keyword for the 'indeterminate' value +inline bool indeterminate(tribool x, detail::indeterminate_t) { + return x.value == tribool::indeterminate_value; +} + +/** @defgroup logical Logical operations + */ +//@{ +/** + * \brief Computes the logical negation of a tribool + * + * \returns the logical negation of the tribool, according to the + * table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
!
 + *
false
true
true
false
indeterminate
indeterminate
+ * \throws nothrow + */ +inline tribool operator!(tribool x) { + return x.value == tribool::false_value ? tribool(true) + : x.value == tribool::true_value ? tribool(false) + : tribool(indeterminate); +} + +/** + * \brief Computes the logical conjuction of two tribools + * + * \returns the result of logically ANDing the two tribool values, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
&&
false
true
indeterminate
false
false
false
false
true
false
true
indeterminate
indeterminate
false
indeterminate
indeterminate
+ * \throws nothrow + */ +inline tribool operator&&(tribool x, tribool y) { + if (static_cast(!x) || static_cast(!y)) + return false; + else if (static_cast(x) && static_cast(y)) + return true; + else + return indeterminate; +} + +/** + * \overload + */ +inline tribool operator&&(tribool x, bool y) { return y ? x : tribool(false); } + +/** + * \overload + */ +inline tribool operator&&(bool x, tribool y) { return x ? y : tribool(false); } + +/** + * \overload + */ +inline tribool operator&&(indeterminate_keyword_t, tribool x) { + return !x ? tribool(false) : tribool(indeterminate); +} + +/** + * \overload + */ +inline tribool operator&&(tribool x, indeterminate_keyword_t) { + return !x ? tribool(false) : tribool(indeterminate); +} + +/** + * \brief Computes the logical disjunction of two tribools + * + * \returns the result of logically ORing the two tribool values, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
||
false
true
indeterminate
false
false
true
indeterminate
true
true
true
true
indeterminate
indeterminate
true
indeterminate
+ * \throws nothrow + */ +inline tribool operator||(tribool x, tribool y) { + if (static_cast(!x) && static_cast(!y)) + return false; + else if (static_cast(x) || static_cast(y)) + return true; + else + return indeterminate; +} + +/** + * \overload + */ +inline tribool operator||(tribool x, bool y) { return y ? tribool(true) : x; } + +/** + * \overload + */ +inline tribool operator||(bool x, tribool y) { return x ? tribool(true) : y; } + +/** + * \overload + */ +inline tribool operator||(indeterminate_keyword_t, tribool x) { + return x ? tribool(true) : tribool(indeterminate); +} + +/** + * \overload + */ +inline tribool operator||(tribool x, indeterminate_keyword_t) { + return x ? tribool(true) : tribool(indeterminate); +} +//@} + +/** + * \brief Compare tribools for equality + * + * \returns the result of comparing two tribool values, according to + * the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
==
false
true
indeterminate
false
true
false
indeterminate
true
false
true
indeterminate
indeterminate
indeterminate
indeterminate
indeterminate
+ * \throws nothrow + */ +inline tribool operator==(tribool x, tribool y) { + if (indeterminate(x) || indeterminate(y)) + return indeterminate; + else + return (x && y) || (!x && !y); +} + +/** + * \overload + */ +inline tribool operator==(tribool x, bool y) { return x == tribool(y); } + +/** + * \overload + */ +inline tribool operator==(bool x, tribool y) { return tribool(x) == y; } + +/** + * \overload + */ +inline tribool operator==(indeterminate_keyword_t, tribool x) { + return tribool(indeterminate) == x; +} + +/** + * \overload + */ +inline tribool operator==(tribool x, indeterminate_keyword_t) { + return tribool(indeterminate) == x; +} + +/** + * \brief Compare tribools for inequality + * + * \returns the result of comparing two tribool values for inequality, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
!=
false
true
indeterminate
false
false
true
indeterminate
true
true
false
indeterminate
indeterminate
indeterminate
indeterminate
indeterminate
+ * \throws nothrow + */ +inline tribool operator!=(tribool x, tribool y) { + if (indeterminate(x) || indeterminate(y)) + return indeterminate; + else + return !((x && y) || (!x && !y)); +} + +/** + * \overload + */ +inline tribool operator!=(tribool x, bool y) { return x != tribool(y); } + +/** + * \overload + */ +inline tribool operator!=(bool x, tribool y) { return tribool(x) != y; } + +/** + * \overload + */ +inline tribool operator!=(indeterminate_keyword_t, tribool x) { + return tribool(indeterminate) != x; +} + +/** + * \overload + */ +inline tribool operator!=(tribool x, indeterminate_keyword_t) { + return x != tribool(indeterminate); +} + +} // namespace logic +} // namespace paddle + +// Pull tribool and indeterminate into namespace "boost" +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; \ + } -- GitLab