Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More include clean-up #1593

Merged
merged 9 commits into from
Sep 27, 2024
Merged

More include clean-up #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0f8272
WIP
cqc-alec Sep 10, 2024
84af5bd
Remove Symbols.hpp.
cqc-alec Sep 24, 2024
c7d88a7
Remove BiMapHeaders.hpp.
cqc-alec Sep 24, 2024
6147166
Remove snprintf undef.
cqc-alec Sep 24, 2024
183eecb
WIP
cqc-alec Sep 24, 2024
2a9af49
Remove pragma.
cqc-alec Sep 26, 2024
299535f
Bump tket version.
cqc-alec Sep 26, 2024
38c9805
Format.
cqc-alec Sep 26, 2024
9eadf24
Re-include typecast.hpp for stub generation.
cqc-alec Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pytket/binders/architecture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "binder_json.hpp"
#include "deleted_hash.hpp"
#include "py_operators.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
4 changes: 0 additions & 4 deletions pytket/binders/circuit/Circuit/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@
#include "tket/Circuit/PauliExpBoxes.hpp"
#include "tket/Circuit/Simulation/CircuitSimulator.hpp"
#include "tket/Circuit/ToffoliBox.hpp"
#include "tket/Gate/OpPtrFunctions.hpp"
#include "tket/Gate/SymTable.hpp"
#include "tket/Mapping/Verification.hpp"
#include "tket/Ops/Op.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
1 change: 0 additions & 1 deletion pytket/binders/circuit/boxes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include "tket/Converters/PhasePoly.hpp"
#include "tket/OpType/OpType.hpp"
#include "tket/Utils/HelperFunctions.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
1 change: 0 additions & 1 deletion pytket/binders/circuit/classical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "tket/Circuit/Conditional.hpp"
#include "tket/Ops/ClassicalOps.hpp"
#include "tket/Ops/OpJsonFactory.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
3 changes: 0 additions & 3 deletions pytket/binders/circuit/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,19 @@
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>

#include <sstream>
#include <tket/Circuit/Circuit.hpp>

#include "binder_json.hpp"
#include "binder_utils.hpp"
#include "deleted_hash.hpp"
#include "py_operators.hpp"
#include "tket/Circuit/Command.hpp"
#include "tket/Gate/Gate.hpp"
#include "tket/Gate/OpPtrFunctions.hpp"
#include "tket/Gate/SymTable.hpp"
#include "tket/Ops/BarrierOp.hpp"
#include "tket/Ops/MetaOp.hpp"
#include "tket/Ops/Op.hpp"
#include "tket/Utils/Constants.hpp"
#include "tket/Utils/Symbols.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
2 changes: 0 additions & 2 deletions pytket/binders/circuit_library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#include "tket/Circuit/CircPool.hpp"
#include "typecast.hpp"

namespace py = pybind11;

namespace tket {

PYBIND11_MODULE(circuit_library, library_m) {
Expand Down
1 change: 0 additions & 1 deletion pytket/binders/include/typecast.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <pybind11/stl.h>

#include "tket/Utils/Expression.hpp"
#include "tket/Utils/Symbols.hpp"
#include "unit_downcast.hpp"

PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
Expand Down
3 changes: 1 addition & 2 deletions pytket/binders/mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@
#include <pybind11/stl.h>
#include <pybind11/stl_bind.h>

#include "binder_utils.hpp"
#include "tket/Circuit/Circuit.hpp"
#include "tket/Mapping/AASLabelling.hpp"
#include "tket/Mapping/AASRoute.hpp"
#include "tket/Mapping/BoxDecomposition.hpp"
#include "tket/Mapping/LexiLabelling.hpp"
#include "tket/Mapping/LexiRoute.hpp"
#include "tket/Mapping/LexiRouteRoutingMethod.hpp"
#include "tket/Mapping/MappingManager.hpp"
#include "tket/Mapping/MultiGateReorder.hpp"
#include "tket/Mapping/RoutingMethodCircuit.hpp"
Expand Down
4 changes: 1 addition & 3 deletions pytket/binders/passes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@
#include <tklog/TketLog.hpp>

#include "binder_json.hpp"
#include "tket/ArchAwareSynth/SteinerForest.hpp"
#include "tket/Mapping/LexiLabelling.hpp"
#include "tket/Mapping/LexiRoute.hpp"
#include "tket/Mapping/LexiRouteRoutingMethod.hpp"
#include "tket/Mapping/RoutingMethod.hpp"
#include "tket/Predicates/CompilerPass.hpp"
#include "tket/Predicates/PassGenerators.hpp"
#include "tket/Predicates/PassLibrary.hpp"
#include "tket/Transformations/ContextualReduction.hpp"
#include "tket/Transformations/PauliOptimisation.hpp"
#include "tket/Transformations/Transform.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
1 change: 0 additions & 1 deletion pytket/binders/placement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include "binder_json.hpp"
#include "binder_utils.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"

namespace py = pybind11;
Expand Down
1 change: 1 addition & 0 deletions pytket/binders/tableau.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <sstream>

#include "tket/Converters/Converters.hpp"
#include "tket/Converters/UnitaryTableauBox.hpp"
#include "typecast.hpp"

Expand Down
2 changes: 0 additions & 2 deletions pytket/binders/unitid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
#include "UnitRegister.hpp"
#include "binder_json.hpp"
#include "py_operators.hpp"
#include "tket/Utils/Json.hpp"
#include "typecast.hpp"
#include "unit_downcast.hpp"

namespace py = pybind11;
using json = nlohmann::json;
Expand Down
2 changes: 1 addition & 1 deletion pytket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def package(self):
cmake.install()

def requirements(self):
self.requires("tket/1.3.27@tket/stable")
self.requires("tket/1.3.28@tket/stable")
self.requires("tklog/0.3.3@tket/stable")
self.requires("tkrng/0.3.3@tket/stable")
self.requires("tkassert/0.3.4@tket/stable")
Expand Down
2 changes: 0 additions & 2 deletions tket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ target_sources(tket
PUBLIC FILE_SET HEADERS
BASE_DIRS ${PROJECT_SOURCE_DIR}/include
FILES
include/tket/Utils/BiMapHeaders.hpp
include/tket/Utils/Constants.hpp
include/tket/Utils/CosSinDecomposition.hpp
include/tket/Utils/EigenConfig.hpp
Expand All @@ -297,7 +296,6 @@ target_sources(tket
include/tket/Utils/MatrixAnalysis.hpp
include/tket/Utils/PauliTensor.hpp
include/tket/Utils/SequencedContainers.hpp
include/tket/Utils/Symbols.hpp
include/tket/Utils/UnitID.hpp
include/tket/OpType/EdgeType.hpp
include/tket/OpType/OpDesc.hpp
Expand Down
2 changes: 1 addition & 1 deletion tket/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class TketConan(ConanFile):
name = "tket"
version = "1.3.27"
version = "1.3.28"
package_type = "library"
license = "Apache 2"
homepage = "https://github.com/CQCL/tket"
Expand Down
1 change: 0 additions & 1 deletion tket/include/tket/ArchAwareSynth/Path.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#pragma once
#include "tket/Architecture/Architecture.hpp"
#include "tket/Placement/Placement.hpp"
#include "tket/Utils/MatrixAnalysis.hpp"
#include "tket/Utils/UnitID.hpp"
namespace tket {
Expand Down
4 changes: 0 additions & 4 deletions tket/include/tket/ArchAwareSynth/SteinerForest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
#include "SteinerTree.hpp"
#include "tket/Circuit/Circuit.hpp"
#include "tket/Converters/PhasePoly.hpp"
#include "tket/Graphs/DirectedGraph.hpp"
#include "tket/Graphs/Utils.hpp"
#include "tket/Utils/GraphHeaders.hpp"
#include "tket/Utils/UnitID.hpp"

namespace tket {
namespace aas {
Expand Down
4 changes: 0 additions & 4 deletions tket/include/tket/Architecture/Architecture.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

#pragma once

#include <iostream>
#include <numeric>
#include <set>
#include <string>
#include <tklog/TketLog.hpp>
Expand All @@ -24,8 +22,6 @@

#include "tket/Graphs/CompleteGraph.hpp"
#include "tket/Graphs/DirectedGraph.hpp"
#include "tket/Utils/BiMapHeaders.hpp"
#include "tket/Utils/EigenConfig.hpp"
#include "tket/Utils/Json.hpp"
#include "tket/Utils/MatrixAnalysis.hpp"
#include "tket/Utils/UnitID.hpp"
Expand Down
1 change: 0 additions & 1 deletion tket/include/tket/Characterisation/DeviceCharacterisation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#pragma once

#include <map>
#include <nlohmann/json.hpp>

#include "ErrorTypes.hpp"
Expand Down
2 changes: 0 additions & 2 deletions tket/include/tket/Circuit/AssertionSynthesis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#pragma once

#include "Circuit.hpp"
#include "tket/Utils/EigenConfig.hpp"
#include "tket/Utils/MatrixAnalysis.hpp"

namespace tket {

Expand Down
3 changes: 1 addition & 2 deletions tket/include/tket/Circuit/Boxes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
#include <optional>

#include "tket/Circuit/Simulation/CircuitSimulator.hpp"
#include "tket/OpType/OpTypeFunctions.hpp"
#include "tket/OpType/OpTypeInfo.hpp"
#include "tket/Ops/Op.hpp"
#include "tket/Utils/BiMapHeaders.hpp"
#include "tket/Utils/EigenConfig.hpp"
#include "tket/Utils/Json.hpp"
#include "tket/Utils/MatrixAnalysis.hpp"
#include "tket/Utils/UnitID.hpp"
Expand Down
3 changes: 0 additions & 3 deletions tket/include/tket/Circuit/Circuit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
// is ignored, and the amortized constant time used for scaling instead

#include <algorithm>
#include <exception>
#include <functional>
#include <list>
#include <map>
Expand All @@ -48,8 +47,6 @@
#include "DAGDefs.hpp"
#include "ResourceData.hpp"
#include "tket/Gate/OpPtrFunctions.hpp"
#include "tket/Utils/Constants.hpp"
#include "tket/Utils/GraphHeaders.hpp"
#include "tket/Utils/Json.hpp"
#include "tket/Utils/SequencedContainers.hpp"
#include "tket/Utils/UnitID.hpp"
Expand Down
1 change: 0 additions & 1 deletion tket/include/tket/Circuit/Conditional.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// require deserialization of a Box.

#include "tket/Ops/Op.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {

Expand Down
2 changes: 0 additions & 2 deletions tket/include/tket/Circuit/ConjugationBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#pragma once

#include "Boxes.hpp"
#include "Circuit.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {
/**
Expand Down
2 changes: 0 additions & 2 deletions tket/include/tket/Circuit/DiagonalBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#include <memory>

#include "Boxes.hpp"
#include "Circuit.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {
/**
Expand Down
1 change: 0 additions & 1 deletion tket/include/tket/Circuit/DummyBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include "Boxes.hpp"
#include "ResourceData.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {

Expand Down
2 changes: 0 additions & 2 deletions tket/include/tket/Circuit/Multiplexor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#pragma once

#include "Boxes.hpp"
#include "Circuit.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {

Expand Down
3 changes: 2 additions & 1 deletion tket/include/tket/Circuit/Simulation/CircuitSimulator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

#pragma once

#include "tket/Utils/MatrixAnalysis.hpp"
#include "tket/Utils/Constants.hpp"
#include "tket/Utils/EigenConfig.hpp"

namespace tket {
class Circuit;
Expand Down
2 changes: 0 additions & 2 deletions tket/include/tket/Circuit/StatePreparation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#include <memory>

#include "Boxes.hpp"
#include "Circuit.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {
/**
Expand Down
2 changes: 0 additions & 2 deletions tket/include/tket/Circuit/ToffoliBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#include <memory>

#include "Boxes.hpp"
#include "Circuit.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {

Expand Down
1 change: 0 additions & 1 deletion tket/include/tket/Converters/Gauss.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#pragma once

#include "Converters.hpp"
#include "tket/Circuit/Circuit.hpp"

namespace tket {
Expand Down
3 changes: 0 additions & 3 deletions tket/include/tket/Converters/PhasePoly.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@

#pragma once
#include "tket/Circuit/Boxes.hpp"
#include "tket/Circuit/CircUtils.hpp"
#include "tket/Circuit/Circuit.hpp"
#include "tket/Utils/HelperFunctions.hpp"
#include "tket/Utils/Json.hpp"
#include "tket/Utils/MatrixAnalysis.hpp"
namespace tket {

Expand Down
2 changes: 1 addition & 1 deletion tket/include/tket/Converters/UnitaryTableauBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#pragma once

#include "Converters.hpp"
#include "tket/Circuit/Boxes.hpp"
#include "tket/Clifford/UnitaryTableau.hpp"

namespace tket {

Expand Down
2 changes: 1 addition & 1 deletion tket/include/tket/Diagonalisation/Diagonalisation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

#pragma once

#include "DiagUtils.hpp"
#include "tket/Circuit/Boxes.hpp"
#include "tket/Circuit/Circuit.hpp"
#include "tket/PauliGraph/PauliGraph.hpp"

namespace tket {

Expand Down
5 changes: 4 additions & 1 deletion tket/include/tket/Diagonalisation/PauliPartition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

#pragma once

#include "DiagUtils.hpp"
#include <stdexcept>

#include "tket/Utils/GraphHeaders.hpp"
#include "tket/Utils/PauliTensor.hpp"

namespace tket {

Expand Down
1 change: 0 additions & 1 deletion tket/include/tket/Gate/Gate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#pragma once

#include "tket/Ops/Op.hpp"
#include "tket/Utils/Json.hpp"

namespace tket {

Expand Down
2 changes: 1 addition & 1 deletion tket/include/tket/Gate/GateUnitaryMatrixUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <string>

#include "tket/OpType/OpType.hpp"
#include "tket/Utils/MatrixAnalysis.hpp"
#include "tket/Utils/EigenConfig.hpp"

namespace tket {
class Gate;
Expand Down
Loading
Loading