Skip to content

Commit

Permalink
Add type() interface for variant
Browse files Browse the repository at this point in the history
  • Loading branch information
From00 committed May 23, 2022
1 parent 2cb6140 commit 2dd86ce
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 1 deletion.
4 changes: 3 additions & 1 deletion paddle/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
add_subdirectory(string)
cc_test(small_vector_test SRCS small_vector_test.cc DEPS gtest gflags)

cc_test(array_ref_test SRCS array_ref_test.cc DEPS gtest gflags)
cc_test(small_vector_test SRCS small_vector_test.cc DEPS gtest gflags)
cc_test(variant_test SRCS variant_test.cc DEPS gtest)
21 changes: 21 additions & 0 deletions paddle/utils/variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -2199,6 +2199,18 @@ class impl : public copy_assignment<traits<Ts...>> {
}
}

inline const std::type_info &type() const {
return visitation::alt::visit_alt_at(
this->index(),
#ifdef MPARK_GENERIC_LAMBDAS
[](auto &alt) -> const std::type_info & { return typeid(alt.value); }
#else
typer {}
#endif
,
*this);
}

private:
#ifndef MPARK_GENERIC_LAMBDAS
struct swapper {
Expand All @@ -2208,6 +2220,13 @@ class impl : public copy_assignment<traits<Ts...>> {
swap(this_alt.value, that_alt.value);
}
};

struct typer {
template <typename Alt>
inline const std::type_info &operator()(Alt &alt) const {
return typeid(alt.value);
}
};
#endif

inline constexpr bool move_nothrow() const {
Expand Down Expand Up @@ -2432,6 +2451,8 @@ class variant {
impl_.swap(that.impl_);
}

inline const std::type_info &type() noexcept { return impl_.type(); }

private:
detail::impl<Ts...> impl_;

Expand Down
44 changes: 44 additions & 0 deletions paddle/utils/variant_test.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// 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.

#include "paddle/utils/variant.h"

#include <string>
#include <vector>
#include "gtest/gtest.h"
#include "paddle/phi/core/enforce.h"

TEST(interface_test, type) {
using phi::enforce::demangle;

paddle::variant<bool, int, float, std::string, std::vector<int>> var;

var = true;
EXPECT_EQ(demangle(var.type().name()), "bool");

var = 0;
EXPECT_EQ(demangle(var.type().name()), "int");

var = 0.f;
EXPECT_EQ(demangle(var.type().name()), "float");

var = std::string();
EXPECT_EQ(demangle(var.type().name()),
"std::__cxx11::basic_string<char, std::char_traits<char>, "
"std::allocator<char> >");

var = std::vector<int>();
EXPECT_EQ(demangle(var.type().name()),
"std::vector<int, std::allocator<int> >");
}

0 comments on commit 2dd86ce

Please sign in to comment.