Skip to content

Commit

Permalink
Merge branch 'main' into calm-down-clang-tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcelwa
marcelwa authored Sep 6, 2024
2 parents e085e98 + 523cf23 commit 00b0fca
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions bindings/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14024,7 +14024,7 @@ Template parameter ``PortType``:
static const char *__doc_fiction_port_list_inp = R"doc(Input and output positions.)doc";

static const char *__doc_fiction_port_list_operator_eq =
R"doc(Comparator for unordered_set/map.
R"doc(Comparator for port lists.

Parameter ``p``:
Ports to compare to.
Expand All @@ -14033,8 +14033,8 @@ Parameter ``p``:
`true` iff these ports are equal to `p`.)doc";

static const char *__doc_fiction_port_list_operator_iadd =
R"doc(Merges two port_list objects together. The given port_list might be
altered.
R"doc(Merges two `port_list` objects together. The given `port_list` might
be altered.

Parameter ``p``:
Ports to merge.
Expand Down
1 change: 1 addition & 0 deletions include/fiction/algorithms/verification/design_rule_violations.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <fmt/color.h>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <mockturtle/traits.hpp>
#include <nlohmann/json.hpp>

Expand Down
1 change: 1 addition & 0 deletions include/fiction/io/dot_drawers.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <fiction/layouts/hexagonal_layout.hpp>

#include <fmt/format.h>
#include <fmt/ranges.h>
#include <kitty/print.hpp>
#include <mockturtle/io/write_dot.hpp>
#include <mockturtle/traits.hpp>
Expand Down
1 change: 1 addition & 0 deletions include/fiction/io/write_sqd_layout.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <fmt/chrono.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

#include <cassert>
#include <chrono>
Expand Down
6 changes: 3 additions & 3 deletions include/fiction/layouts/coordinates.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ struct formatter<fiction::offset::ucoord_t>
}

template <typename FormatContext>
auto format(const fiction::offset::ucoord_t& c, FormatContext& ctx)
auto format(const fiction::offset::ucoord_t& c, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{},{})", c.x, c.y, c.z);
}
Expand All @@ -1096,7 +1096,7 @@ struct formatter<fiction::cube::coord_t>
}

template <typename FormatContext>
auto format(const fiction::cube::coord_t& c, FormatContext& ctx)
auto format(const fiction::cube::coord_t& c, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{},{})", c.x, c.y, c.z);
}
Expand All @@ -1112,7 +1112,7 @@ struct formatter<fiction::siqad::coord_t>
}

template <typename FormatContext>
auto format(const fiction::siqad::coord_t& c, FormatContext& ctx)
auto format(const fiction::siqad::coord_t& c, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{},{})", c.x, c.y, c.z);
}
Expand Down
9 changes: 5 additions & 4 deletions include/fiction/technology/cell_ports.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
#include "fiction/utils/hash.hpp"

#include <fmt/format.h>
#include <fmt/ranges.h>

#include <cassert>
#include <cstdint>
#include <cstdlib>
#include <functional>
#include <set>
#include <unordered_map>
#include <utility>

namespace fiction
Expand Down Expand Up @@ -174,7 +175,7 @@ struct port_list
*/
std::set<PortType> inp{}, out{};
/**
* Comparator for unordered_set/map.
* Comparator for port lists.
*
* @param p Ports to compare to.
* @return `true` iff these ports are equal to `p`.
Expand All @@ -184,7 +185,7 @@ struct port_list
return this->inp == p.inp && this->out == p.out;
}
/**
* Merges two port_list objects together. The given port_list might be altered.
* Merges two `port_list` objects together. The given `port_list` might be altered.
*
* @param p Ports to merge.
* @return Merged port lists.
Expand Down Expand Up @@ -292,7 +293,7 @@ struct formatter<fiction::port_list<PortType>>
}

template <typename FormatContext>
auto format(const fiction::port_list<PortType>& pl, FormatContext& ctx)
auto format(const fiction::port_list<PortType>& pl, FormatContext& ctx) const
{
return format_to(ctx.out(), "inp: {}, out: {}", join(pl.inp, ", "), join(pl.out, ", "));
}
Expand Down
2 changes: 1 addition & 1 deletion libs/json
Submodule json updated 2 files
+129 −129 nlohmann_json.natvis
+13 −13 tools/generate_natvis/nlohmann_json.natvis.j2
2 changes: 1 addition & 1 deletion libs/mockturtle
Submodule mockturtle updated 61 files
+1 −1 experiments/experiments.hpp
+1 −1 include/mockturtle/algorithms/aig_balancing.hpp
+1 −1 include/mockturtle/algorithms/akers_synthesis.hpp
+1 −1 include/mockturtle/algorithms/aqfp/aqfp_db.hpp
+1 −1 include/mockturtle/algorithms/aqfp/aqfp_fanout_resyn.hpp
+1 −1 include/mockturtle/algorithms/aqfp/aqfp_retiming.hpp
+2 −2 include/mockturtle/algorithms/aqfp/buffer_insertion.hpp
+5 −4 include/mockturtle/algorithms/aqfp/detail/dag.hpp
+1 −1 include/mockturtle/algorithms/aqfp/detail/dag_cost.hpp
+1 −1 include/mockturtle/algorithms/aqfp/detail/dag_gen.hpp
+1 −1 include/mockturtle/algorithms/aqfp/detail/dag_util.hpp
+1 −1 include/mockturtle/algorithms/aqfp/detail/db_builder.hpp
+1 −1 include/mockturtle/algorithms/aqfp/mig_algebraic_rewriting_splitters.hpp
+1 −1 include/mockturtle/algorithms/cut_enumeration/spectr_cut.hpp
+4 −4 include/mockturtle/algorithms/emap.hpp
+2 −2 include/mockturtle/algorithms/experimental/cost_resyn.hpp
+1 −0 include/mockturtle/algorithms/linear_resynthesis.hpp
+3 −3 include/mockturtle/algorithms/lut_mapper.hpp
+1 −1 include/mockturtle/algorithms/mig_algebraic_rewriting.hpp
+1 −1 include/mockturtle/algorithms/reconv_cut.hpp
+2 −2 include/mockturtle/algorithms/resyn_engines/xag_resyn.hpp
+1 −1 include/mockturtle/algorithms/xag_balancing.hpp
+1 −1 include/mockturtle/algorithms/xmg_algebraic_rewriting.hpp
+1 −1 include/mockturtle/algorithms/xmg_resub.hpp
+6 −1 include/mockturtle/generators/control.hpp
+1 −1 include/mockturtle/generators/self_dualize.hpp
+83 −20 include/mockturtle/io/serialize.hpp
+1 −1 include/mockturtle/networks/aqfp.hpp
+2 −2 include/mockturtle/properties/aqfpcost.hpp
+1 −1 include/mockturtle/utils/struct_library.hpp
+4 −4 include/mockturtle/utils/tech_library.hpp
+6 −6 include/mockturtle/utils/window_utils.hpp
+2 −2 include/mockturtle/views/mffc_view.hpp
+2 −2 include/mockturtle/views/rank_view.hpp
+3 −1 lib/abcsat/abc/satVec.h
+24 −21 lib/bill/bill/dd/zdd.hpp
+3 −1 lib/bill/bill/sat/solver/abc/satVec.h
+54 −61 lib/fmt/fmt/args.h
+3,077 −0 lib/fmt/fmt/base.h
+335 −143 lib/fmt/fmt/chrono.h
+81 −112 lib/fmt/fmt/color.h
+52 −58 lib/fmt/fmt/compile.h
+4 −2,968 lib/fmt/fmt/core.h
+277 −27 lib/fmt/fmt/format-inl.h
+624 −732 lib/fmt/fmt/format.h
+86 −102 lib/fmt/fmt/os.h
+25 −59 lib/fmt/fmt/ostream.h
+117 −136 lib/fmt/fmt/printf.h
+314 −170 lib/fmt/fmt/ranges.h
+278 −116 lib/fmt/fmt/std.h
+109 −46 lib/fmt/fmt/xchar.h
+7 −0 lib/lorina/lorina/verilog.hpp
+1 −1 lib/parallel_hashmap/parallel_hashmap/phmap.h
+45 −16 lib/parallel_hashmap/parallel_hashmap/phmap_dump.h
+2 −2 lib/percy/percy/fence.hpp
+78 −2 test/io/serialize.cpp
+0 −1 test/io/write_aiger.cpp
+40 −3 test/test.cpp
+5 −5 test/utils/struct_library.cpp
+10 −10 test/utils/window_utils.cpp
+2 −1 test/views/rank_view.cpp
2 changes: 1 addition & 1 deletion libs/pybind11
Submodule pybind11 updated 12 files
+5 −5 .pre-commit-config.yaml
+1 −0 CMakeLists.txt
+14 −1 include/pybind11/detail/class.h
+71 −0 include/pybind11/detail/exception_translation.h
+2 −53 include/pybind11/pybind11.h
+3 −3 tests/conftest.py
+1 −0 tests/extra_python_package/test_files.py
+1 −1 tests/test_async.py
+12 −0 tests/test_buffers.cpp
+7 −0 tests/test_buffers.py
+1 −1 tests/test_custom_type_setup.py
+1 −1 tests/test_numpy_array.py
2 changes: 1 addition & 1 deletion libs/tinyxml2
Submodule tinyxml2 updated 1 files
+3 −3 tinyxml2.h

0 comments on commit 00b0fca

Please sign in to comment.