ENABLE_CPP_INT

Author: WrathfulSpatula

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.10)
-project (Qrack VERSION 10.4.1 DESCRIPTION "High Performance Quantum Bit Simulation" LANGUAGES CXX)
+project (Qrack VERSION 10.5.0 DESCRIPTION "High Performance Quantum Bit Simulation" LANGUAGES CXX)
 
 # Installation commands
 include (GNUInstallDirs)

cmake/Boost.cmake

@@ -1,4 +1,5 @@
 option (ENABLE_BOOST "Use Boost libraries (if available)" ON)
+option (ENABLE_CPP_INT "Use Boost library cpp_int (if available)" OFF)
 if (ENABLE_BOOST)
     if (POLICY CMP0167)
         cmake_policy(SET CMP0167 NEW)

include/common/config.h.in

@@ -1,5 +1,6 @@
 #cmakedefine ENABLE_ALU 1
 #cmakedefine ENABLE_BCD 1
+#cmakedefine ENABLE_CPP_INT 1
 #cmakedefine ENABLE_DEVRAND 1
 #cmakedefine ENABLE_ENV_VARS 1
 #cmakedefine ENABLE_FMA 1

include/common/qrack_functions.hpp

@@ -36,7 +36,8 @@
                                                                                                                        \
     return 0;
 
-#if (QBCAPPOW < 7) || ((QBCAPPOW < 8) && defined(__SIZEOF_INT128__)) || ((QBCAPPOW > 7) && defined(BOOST_AVAILABLE))
+#if (QBCAPPOW < 7) || ((QBCAPPOW < 8) && defined(__SIZEOF_INT128__)) ||                                                \
+    ((QBCAPPOW > 7) && defined(BOOST_AVAILABLE) && defined(ENABLE_CPP_INT))
 inline void bi_not_ip(bitCapInt* left) { *left = ~(*left); }
 inline void bi_and_ip(bitCapInt* left, const bitCapInt& right) { *left &= right; }
 inline void bi_or_ip(bitCapInt* left, const bitCapInt& right) { *left |= right; }
@@ -146,7 +147,7 @@ inline bitLenInt popCountOcl(bitCapIntOcl n)
 
 #if (QBCAPPOW < 7) || ((QBCAPPOW < 8) && defined(__SIZEOF_INT128__))
 inline int bi_log2(const bitCapInt& n) { return log2Ocl((bitCapIntOcl)n); }
-#elif (QBCAPPOW > 7) && defined(BOOST_AVAILABLE)
+#elif (QBCAPPOW > 7) && defined(BOOST_AVAILABLE) && defined(ENABLE_CPP_INT)
 inline int bi_log2(const bitCapInt& n) { return boost::multiprecision::msb(n); }
 #endif
 inline bitLenInt log2(bitCapInt n) { return (bitLenInt)bi_log2(n); }

include/common/qrack_types.hpp

@@ -73,7 +73,7 @@ constexpr bitCapInt QRACK_MAX_UINT = ~0U;
 #define bitCapInt unsigned __int128
 #define QRACK_MAX_QUBITS 128
 constexpr bitCapInt QRACK_MAX_UINT = ~0U;
-#elif BOOST_AVAILABLE
+#elif ENABLE_CPP_INT && BOOST_AVAILABLE
 #include <boost/multiprecision/cpp_int.hpp>
 constexpr size_t QRACK_MAX_QUBITS = (1 << QBCAPPOW);
 typedef boost::multiprecision::cpp_int bitCapInt;

include/statevector.hpp

@@ -25,7 +25,7 @@
 #include <future>
 #endif
 
-#if (QBCAPPOW > 6) && BOOST_AVAILABLE
+#if ENABLE_CPP_INT && (QBCAPPOW > 6) && BOOST_AVAILABLE
 #include <map>
 #define SparseStateVecMap std::map<bitCapInt, complex>
 #else