Update/clean headers

eltociear · Sep 4, 2023 · ebc7265 · ebc7265
1 parent aefba6d
commit ebc7265
Show file tree

Hide file tree

Showing 65 changed files with 90 additions and 135 deletions.
diff --git a/include/common/complex16x2simd.hpp b/include/common/complex16x2simd.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a SIMD implementation of the double precision complex type.
 // The API is designed to (almost entirely) mirror that of the C++ standard library

diff --git a/include/common/complex8x2simd.hpp b/include/common/complex8x2simd.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a SIMD implementation of the float precision complex type.
 // The API is designed to (almost entirely) mirror that of the C++ standard library

diff --git a/include/common/cuda_kernels.cuh b/include/common/cuda_kernels.cuh
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/common/cudaengine.cuh b/include/common/cudaengine.cuh
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#define _USE_MATH_DEFINES
-
 #include "oclapi.hpp"
 
 #if !ENABLE_CUDA
@@ -22,7 +20,6 @@
 
 #include <cuda_runtime.h>
 
-#include <map>
 #include <memory>
 #include <mutex>
 #include <vector>

diff --git a/include/common/dispatchqueue.hpp b/include/common/dispatchqueue.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -20,8 +20,6 @@
 #error PTHREAD or QUNIT_CPU_PARALLEL has not been enabled
 #endif
 
-#define _USE_MATH_DEFINES
-
 #include <condition_variable>
 #include <functional>
 #include <future>

diff --git a/include/common/oclapi.hpp b/include/common/oclapi.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/common/oclengine.hpp b/include/common/oclengine.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#define _USE_MATH_DEFINES
-
 #include "oclapi.hpp"
 
 #if !ENABLE_OPENCL
@@ -24,12 +22,12 @@
 #include <direct.h>
 #endif
 
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #if defined(__APPLE__)
 #define CL_SILENCE_DEPRECATION

diff --git a/include/common/parallel_for.hpp b/include/common/parallel_for.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -14,9 +14,6 @@
 
 #include "qrack_functions.hpp"
 
-#include <set>
-#include <vector>
-
 namespace Qrack {
 
 class ParallelFor {

diff --git a/include/common/qrack_functions.hpp b/include/common/qrack_functions.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/common/qrack_types.hpp b/include/common/qrack_types.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -63,21 +63,18 @@ typedef half_float::half real1;
 typedef float real1_f;
 typedef float real1_s;
 #endif
-} // namespace Qrack
 #elif FPPOW < 6
 namespace Qrack {
 typedef std::complex<float> complex;
 typedef float real1;
 typedef float real1_f;
 typedef float real1_s;
-} // namespace Qrack
 #elif FPPOW < 7
 namespace Qrack {
 typedef std::complex<double> complex;
 typedef double real1;
 typedef double real1_f;
 typedef double real1_s;
-} // namespace Qrack
 #else
 #include <boost/multiprecision/float128.hpp>
 #include <quadmath.h>
@@ -86,12 +83,8 @@ typedef std::complex<boost::multiprecision::float128> complex;
 typedef boost::multiprecision::float128 real1;
 typedef boost::multiprecision::float128 real1_f;
 typedef double real1_s;
-// Minimum representable difference from 1
-} // namespace Qrack
 #endif
 
-namespace Qrack {
-
 #if UINTPOW < 4
 constexpr uint8_t ONE_BCI = 1U;
 #define bitCapIntOcl uint8_t
@@ -128,7 +121,7 @@ constexpr bitLenInt bitsInCap = ((bitLenInt)1U) << (QBCAPPOW + 3U);
 
 typedef std::shared_ptr<complex> BitOp;
 
-/** Called once per value between begin and end. */
+// Called once per value between begin and end.
 typedef std::function<void(const bitCapIntOcl&, const unsigned& cpu)> ParallelFunc;
 typedef std::function<bitCapIntOcl(const bitCapIntOcl&)> IncrementFunc;
 typedef std::function<bitCapInt(const bitCapInt&)> BdtFunc;

diff --git a/include/common/rdrandwrapper.hpp b/include/common/rdrandwrapper.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This class allows access to on-chip RNG capabilities. The class is adapted from these two sources:
 // https://codereview.stackexchange.com/questions/147656/checking-if-cpu-supports-rdrand/150230

diff --git a/include/hamiltonian.hpp b/include/hamiltonian.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -13,8 +13,6 @@
 
 #include "common/qrack_types.hpp"
 
-#include <vector>
-
 struct _QrackTimeEvolveOpHeader {
     unsigned target;
     unsigned controlLen;

diff --git a/include/mpsshard.hpp b/include/mpsshard.hpp
@@ -1,3 +1,15 @@
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
+//
+// This is a multithreaded, universal quantum register simulation, allowing
+// (nonphysical) register cloning and direct measurement of probability and
+// phase, to leverage what advantages classical emulation of qubits can have.
+//
+// Licensed under the GNU Lesser General Public License V3.
+// See LICENSE.md in the project root or https://www.gnu.org/licenses/lgpl-3.0.en.html
+// for details.
+
 #pragma once
 #include "common/qrack_functions.hpp"
 

diff --git a/include/qalu.hpp b/include/qalu.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2022. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/qbdt.hpp b/include/qbdt.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // QBinaryDecision tree is an alternative approach to quantum state representation, as
 // opposed to state vector representation. This is a compressed form that can be

diff --git a/include/qbdt_node.hpp b/include/qbdt_node.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // QBinaryDecision tree is an alternative approach to quantum state representation, as
 // opposed to state vector representation. This is a compressed form that can be

diff --git a/include/qbdt_node_interface.hpp b/include/qbdt_node_interface.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // QBinaryDecision tree is an alternative approach to quantum state representation, as
 // opposed to state vector representation. This is a compressed form that can be

diff --git a/include/qengine_cpu.hpp b/include/qengine_cpu.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/qengine_cuda.hpp b/include/qengine_cuda.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -12,17 +12,15 @@
 
 #pragma once
 
+#include "common/cudaengine.cuh"
+#include "qengine.hpp"
 #include "qengine_gpu_util.hpp"
 
 #if !ENABLE_CUDA
 #error CUDA has not been enabled
 #endif
 
-#include "common/cudaengine.cuh"
-#include "qengine.hpp"
-
 #include <list>
-#include <mutex>
 
 #define BCI_ARG_LEN 10
 #define CMPLX_NORM_LEN 6

diff --git a/include/qengine_gpu_util.hpp b/include/qengine_gpu_util.hpp
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "common/qrack_types.hpp"
+#include <string>
 
 namespace Qrack {
 

diff --git a/include/qengine_opencl.hpp b/include/qengine_opencl.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -12,15 +12,14 @@
 
 #pragma once
 
+#include "common/oclengine.hpp"
+#include "qengine.hpp"
 #include "qengine_gpu_util.hpp"
 
 #if !ENABLE_OPENCL
 #error OpenCL has not been enabled
 #endif
 
-#include "common/oclengine.hpp"
-#include "qengine.hpp"
-
 #include <list>
 #include <mutex>
 

diff --git a/include/qengineshard.hpp b/include/qengineshard.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // QEngineShard is the atomic qubit unit of the QUnit mapper. "PhaseShard" optimizations are basically just a very
 // specific "gate fusion" type optimization, where multiple gates are composed into single product gates before

diff --git a/include/qfactory.hpp b/include/qfactory.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/qhybrid.hpp b/include/qhybrid.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/qinterface.hpp b/include/qinterface.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2022. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and
@@ -18,7 +18,6 @@
 
 #include <map>
 #include <random>
-#include <vector>
 
 #if ENABLE_UINT128
 #include <ostream>

diff --git a/include/qpager.hpp b/include/qpager.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2022. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/qparity.hpp b/include/qparity.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2022. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // This is a multithreaded, universal quantum register simulation, allowing
 // (nonphysical) register cloning and direct measurement of probability and

diff --git a/include/qstabilizer.hpp b/include/qstabilizer.hpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
 //
-// (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
+// (C) Daniel Strano and the Qrack contributors 2017-2023. All rights reserved.
 //
 // Adapted from:
 //
@@ -26,8 +26,6 @@
 
 #include "qinterface.hpp"
 
-#include <cstdint>
-
 namespace Qrack {
 
 struct AmplitudeEntry {