Version 3.3

softwareQinc · Oct 6, 2023 · 47cb432 · 47cb432
1 parent 74689f9
commit 47cb432
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,7 +62,6 @@ doc/
 .DS_Store
 .cmake/
 Testing/
-.s3_table_file.csv
 
 # pystaq
 Makefile

diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,8 @@
-Pre-release
-    - Added grid synth rotation synthesizer algorithm, requires GNU MP.
-      Disabled by default, to enable, pass `-DBUILD_GRID_SYNTH=ON` to CMake.
-      When enabled, builds `staq_grid_synth` and `staq_qasm_synth`.
+Version 3.3
+    - Implemented the  grid synth rotation synthesizer algorithm
+      https://arxiv.org/abs/1403.2975, enabled only when the GNU MP library is
+      detected. When enabled, the build will include `staq_grid_synth` and
+      `staq_qasm_synth`.
 
 Version 3.2.3 - 14 August 2023
     - Minor bugfix in pystaq setup.py that prevented pip install from remote

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-set(STAQ_VERSION_NUM 3.2.3)
+set(STAQ_VERSION_NUM 3.3)
 set(STAQ_VERSION_STR "${STAQ_VERSION_NUM}")
 project(staq VERSION ${STAQ_VERSION_NUM} LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)

diff --git a/Doxyfile b/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = staq
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v3.2.3
+PROJECT_NUMBER         = v3.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/INSTALL.md b/INSTALL.md
@@ -32,13 +32,10 @@ To build both tool suite and the **staq** executable, execute
 cmake -B build
 ```
 
-If you want to build the grid synth tool `staq_grid_synth`, install the
-[GNU MP library](https://gmplib.org/) and enable building `staq_grid_synth` via
-the `CMake` option `-DBUILD_GRID_SYNTH=ON` (`OFF` by default), i.e.,
-
-```shell
-cmake -B build -DBUILD_GRID_SYNTH=ON
-```
+**Important**: If you want to build the grid synth tools `staq_grid_synth`
+and `staq_qasm_synth`, install the [GNU MP library](https://gmplib.org/);
+`cmake` will take care of the rest. If `cmake` cannot detect GNU MP, then the
+grid synth tools will not be part of the build.
 
 For more details about how to install and configure GNU MP on various platforms,
 see the

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # staq
 
-## Version 3.2.3 - 14 August 2023
+## Version 3.3 - 6 October 2023
 
 [![GitHub actions](https://github.com/softwareqinc/staq/actions/workflows/cmake.yml/badge.svg)](https://github.com/softwareQinc/staq/actions)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-Version 3.2.3 - 14 August 2023
+Version 3.3 - 6 October 2023
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pystaq"
-version = "3.2.3"
+version = "3.3"
 description = "Python 3 wrapper for staq"
 authors = [
     { name = "softwareQ Inc.", email = "[email protected]" },

diff --git a/tools/device_generator.cpp b/tools/device_generator.cpp
@@ -24,9 +24,10 @@
  * SOFTWARE.
  */
 
-#include <CLI/CLI.hpp>
 #include <tuple>
 
+#include <CLI/CLI.hpp>
+
 #include "mapping/device.hpp"
 
 static double FIDELITY_1 = staq::mapping::FIDELITY_1;

diff --git a/tools/grid_synth.cpp b/tools/grid_synth.cpp
@@ -24,12 +24,13 @@
  * SOFTWARE.
  */
 
-#include <CLI/CLI.hpp>
 #include <chrono>
 #include <cstdlib>
 #include <iostream>
 #include <vector>
 
+#include <CLI/CLI.hpp>
+
 #include "grid_synth/exact_synthesis.hpp"
 #include "grid_synth/grid_synth.hpp"
 #include "grid_synth/regions.hpp"

diff --git a/tools/qasm_synth.cpp b/tools/qasm_synth.cpp
@@ -24,9 +24,10 @@
  * SOFTWARE.
  */
 
-#include <CLI/CLI.hpp>
 #include <iostream>
 
+#include <CLI/CLI.hpp>
+
 #include "grid_synth/gmp_functions.hpp"
 #include "grid_synth/types.hpp"
 #include "qasmtools/parser/parser.hpp"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Version 3.2.3 - 14 August 2023
		Version 3.3 - 6 October 2023