Create a release with the QI2 integration test branch

.github/workflows/assets.yml

@@ -8,32 +8,27 @@ on:
     branches:
     - 'release**'
 
-# Note: 'actions/upload-release-asset@v1' often fails with 'read ECONNRESET'
-# According to https://github.com/actions/upload-release-asset, it is no longer maintained
-# To increase the chances of obtaining all assets - potentially after manually retrying - we set
-# 'jobs.<job_id>.strategy.fail-fast: false' until a proper solution is implemented
 jobs:
-  macos:
-    name: PyPI wheels for macOS
+  macos-x64:
+    if: ${{ false }}  # disable for now
+    name: 'PyPI wheels for MacOS/x64'
     runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
         python:
-        - '3.8'
-        - '3.9'
-        - '3.10'
+        #- '3.8'
+        #- '3.9'
+        #- '3.10'
         - '3.11'
     steps:
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies
       run: |
-        brew install bison flex swig xquartz
-        echo "/usr/local/opt/bison/bin" >> $GITHUB_PATH
-        echo "/usr/local/opt/flex/bin" >> $GITHUB_PATH
-        python -m pip install --upgrade pip setuptools wheel
+        brew install swig xquartz
+        python -m pip install --upgrade pip conan setuptools wheel
     - name: Checkout
       uses: actions/checkout@v3
     - name: Build wheel
@@ -43,7 +38,7 @@ jobs:
     - name: Wheel path
       id: wheel
       working-directory: pybuild/dist/
-      run: echo "##[set-output name=wheel;]$(ls *.whl)"
+      run: echo "{wheel}={$(ls *.whl)}" >> $GITHUB_OUTPUT
     - uses: actions/upload-artifact@v3
       with:
         name: pypi-macos-py${{ matrix.python }}
@@ -58,55 +53,124 @@ jobs:
         asset_name: ${{ steps.wheel.outputs.wheel }}
         asset_content_type: application/zip
 
-  manylinux:
-    name: PyPI wheels for Manylinux
+  manylinux-x64:
+    #if: ${{ false }}  # disable for now
+    name: 'PyPI wheels for Manylinux/x64'
     runs-on: ubuntu-latest
     container: quay.io/pypa/manylinux${{ matrix.manylinux }}_x86_64:latest
     env:
-      FLEX_VERSION: '2.6.4'
-      BISON_VERSION: ${{ matrix.bison_version }}
       SWIG_VERSION: ${{ matrix.swig_version }}
-      CMAKE_VERSION: '3.1.3'
+      CMAKE_VERSION: '3.12'
     strategy:
       fail-fast: false
       matrix:
         manylinux:
-        - 2014
         - _2_28
         cpython_version:
-        - 'cp38-cp38'
-        - 'cp39-cp39'
-        - 'cp310-cp310'
+        #- 'cp38-cp38'
+        #- 'cp39-cp39'
+        #- 'cp310-cp310'
         - 'cp311-cp311'
         include:
-          - manylinux: 2014
-            bison_version: 'bison-3.0.4-2.el7'
-            swig_version: 'swig3-3.0.12-17.el7'
           - manylinux: _2_28
-            bison_version: 'bison-3.0.4-10.el8'
             swig_version: 'swig-3.0.12-19.module_el8.3.0+6167+838326ab'
-
     steps:
     - name: Install dependencies
       run: |
-        yum install -y $BISON_VERSION $SWIG_VERSION
-        /opt/python/${{ matrix.cpython_version }}/bin/python -m pip install auditwheel
-    - name: Install flex
+        dnf install -y $SWIG_VERSION
+        python_bin="/opt/python/${{ matrix.cpython_version }}/bin/python"
+        ${python_bin} -m pip install auditwheel conan wheel-inspect
+        pip_installation_folder=$(${python_bin} -m pip show --files conan | grep 'Location:' | sed 's/Location: //')
+        conan_installation_folder_relative_path=$(${python_bin} -m pip show --files conan | grep '/bin/' | sed 's#\s\+\(.*\)/conan#\1#')
+        conan_installation_folder="${pip_installation_folder}/${conan_installation_folder_relative_path}"
+        echo "Conan installation folder: ${conan_installation_folder}"
+        echo "${conan_installation_folder}" >> $GITHUB_PATH
+    - name: Get latest CMake
+      uses: lukka/get-cmake@latest
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Build wheel
+      env:
+        NPROCS: 5
+      run: |
+        /opt/python/${{ matrix.cpython_version }}/bin/python setup.py bdist_wheel
+        wheel2json pybuild/dist/*.whl
+        /opt/python/${{ matrix.cpython_version }}/bin/python -m auditwheel repair pybuild/dist/*.whl
+      shell: bash
+    - name: Wheel path
+      id: wheel
+      working-directory: wheelhouse
+      run: echo "{wheel}={$(ls *.whl)}" >> $GITHUB_OUTPUT
+    - uses: actions/upload-artifact@v3
+      with:
+        name: pypi-linux-${{ matrix.cpython_version }}
+        path: wheelhouse/${{ steps.wheel.outputs.wheel }}
+    - uses: actions/upload-release-asset@v1
+      if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: wheelhouse/${{ steps.wheel.outputs.wheel }}
+        asset_name: ${{ steps.wheel.outputs.wheel }}
+        asset_content_type: application/zip
+
+  manylinux-arm64:
+    if: ${{ false }}  # disable for now
+    name: 'PyPI wheels for Manylinux/ARM64'
+    runs-on: [self-hosted, ARM64, Linux]
+    container: quay.io/pypa/manylinux${{ matrix.manylinux }}_aarch64:latest
+    env:
+      BISON_VERSION: ${{ matrix.bison_version }}
+      FLEX_VERSION: ${{ matrix.flex_version }}
+      JAVA_VERSION: ${{ matrix.java_version }}
+      SWIG_VERSION: ${{ matrix.swig_version }}
+      CMAKE_VERSION: '3.12'
+    strategy:
+      fail-fast: false
+      matrix:
+        manylinux:
+        - _2_28
+        cpython_version:
+        #- 'cp38-cp38'
+        #- 'cp39-cp39'
+        #- 'cp310-cp310'
+        - 'cp311-cp311'
+        # We are having problems when using the m4 and zulu-opendjk Conan packages on an armv8 architecture
+        # m4 is required by flex/bison and zulu-openjdk provides the Java JRE required by the ANTLR generator
+        # So, for the time being, we are installing flex/bison and java manually for this platform
+        include:
+          - manylinux: _2_28
+            bison_version: 'bison-3.0.4-10.el8'
+            flex_version: 'flex-2.6.1-9.el8'
+            java_version: 'java-11-openjdk-11.0.20.0.8-3.el8'
+            swig_version: 'swig-3.0.12-19.module_el8.4.0+2254+838326ab'
+    steps:
+    - name: Install dependencies
       run: |
-        mkdir -p $HOME/flex
-        curl -L https://github.com/westes/flex/releases/download/v$FLEX_VERSION/flex-$FLEX_VERSION.tar.gz | tar xz --strip-components=1 -C $HOME/flex
-        cd $HOME/flex
-        ./configure
-        make -j
-        make install
+        dnf install -y $BISON_VERSION $FLEX_VERSION $JAVA_VERSION $SWIG_VERSION
+        python_bin="/opt/python/${{ matrix.cpython_version }}/bin/python"
+        ${python_bin} -m pip install auditwheel conan wheel-inspect
+        pip_installation_folder=$(${python_bin} -m pip show --files conan | grep 'Location:' | sed 's/Location: //')
+        conan_installation_folder_relative_path=$(${python_bin} -m pip show --files conan | grep '/bin/' | sed 's#\s\+\(.*\)/conan#\1#')
+        conan_installation_folder="${pip_installation_folder}/${conan_installation_folder_relative_path}"
+        echo "Conan installation folder: ${conan_installation_folder}"
+        echo "${conan_installation_folder}" >> $GITHUB_PATH
     - name: Get latest CMake
       uses: lukka/get-cmake@latest
     - name: Checkout
       uses: actions/checkout@v3
+    - name: Build wheel
+      env:
+        NPROCS: 5
+      run: |
+        /opt/python/${{ matrix.cpython_version }}/bin/python setup.py bdist_wheel
+        wheel2json pybuild/dist/*.whl
+        /opt/python/${{ matrix.cpython_version }}/bin/python -m auditwheel repair pybuild/dist/*.whl
     - name: Wheel path
       id: wheel
       working-directory: wheelhouse
-      run: echo "##[set-output name=wheel;]$(ls *.whl)"
+      run: echo "{wheel}={$(ls *.whl)}" >> $GITHUB_OUTPUT
     - uses: actions/upload-artifact@v3
       with:
         name: pypi-linux-${{ matrix.cpython_version }}
@@ -121,33 +185,25 @@ jobs:
         asset_name: ${{ steps.wheel.outputs.wheel }}
         asset_content_type: application/zip
 
-  windows:
-    name: PyPI wheels for Windows
+  windows-x64:
+    if: ${{ false }}  # disable for now
+    name: 'PyPI wheels for Windows/x64'
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
         python:
-        - '3.8'
-        - '3.9'
-        - '3.10'
+        #- '3.8'
+        #- '3.9'
+        #- '3.10'
         - '3.11'
     steps:
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
-    - uses: actions/cache@v3
-      with:
-        path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-        key: ${{ runner.os }}-chocolatey-python-1
-        restore-keys: |
-          ${{ runner.os }}-chocolatey-python-
-          ${{ runner.os }}-chocolatey-
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip setuptools wheel
-        choco install winflexbison3 --version 2.5.18.20190508
-        #choco install swig --version 4.0.1
+        python -m pip install --upgrade pip conan setuptools wheel
     - name: Checkout
       uses: actions/checkout@v3
     - name: Build wheel
@@ -157,7 +213,7 @@ jobs:
     - name: Wheel path
       id: wheel
       working-directory: pybuild/dist/
-      run: echo "##[set-output name=wheel;]$(Get-ChildItem -name *.whl)"
+      run: echo "{wheel}={$(Get-ChildItem -name *.whl)}" >> $GITHUB_OUTPUT
     - uses: actions/upload-artifact@v3
       with:
         name: pypi-windows-py${{ matrix.python }}
@@ -174,11 +230,13 @@ jobs:
 
   publish:
     name: Publish
+    #if: ${{ false }}  # disable for now
     if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
     needs:
-    - macos
-    - manylinux
-    - windows
+    #- macos-x64
+    - manylinux-x64
+    #- manylinux-arm64
+    #- windows-x64
     runs-on: ubuntu-latest
     steps:
     - name: Download artifacts

.github/workflows/test.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   cpp-linux-macos-windows:
+    if: ${{ false }}  # disable for now
     name: 'C++ tests (Linux-MacOS-Windows/x64)'
     strategy:
       fail-fast: false
@@ -59,7 +60,7 @@ jobs:
       matrix:
         os:
           - Linux
-          - macOS
+          #- macOS
     steps:
       - if: matrix.os == 'Linux'
         name: Install gcc and python (Linux)
@@ -96,6 +97,7 @@ jobs:
         run: ctest -C Release --output-on-failure
 
   python:
+    if: ${{ false }}  # disable for now
     name: Python
     runs-on: ${{ matrix.os }}
     strategy:

CMakeLists.txt

@@ -181,11 +181,13 @@ find_package(nlohmann_json REQUIRED)
 
 include(FetchContent)
 
+
+# QI2 integration test: temporarily using a commit from libqasm/qi2_integration_test
 message(STATUS "Fetching cqasm")
 FetchContent_Declare(cqasm
     message(STATUS "Fetching cqasm")
     GIT_REPOSITORY https://github.com/QuTech-Delft/libqasm.git
-    GIT_TAG "9879dcc9ce5f750f9d2110d1cc81162be63ad9d7"
+    GIT_TAG "89b3194d10073ca2028dac75df87c27697ef6443"
 )
 FetchContent_MakeAvailable(cqasm)
 
@@ -194,7 +196,7 @@ FetchContent_MakeAvailable(cqasm)
 message(STATUS "Fetching lemon")
 FetchContent_Declare(lemon
     GIT_REPOSITORY https://github.com/rturrado/lemon.git
-    GIT_TAG "e70acea5764a97ab3b6d31b883300f3ce1587cde"
+    GIT_TAG "98949a86b83572f66f79ac21516ff44dfd4c40db"
 )
 FetchContent_MakeAvailable(lemon)
 

conanfile.py

@@ -16,6 +16,7 @@ class OpenQLConan(ConanFile):
         "debug_symbols": [True, False],
         "disable_unitary": [True, False],
         "python_dir": [None, "ANY"],
+        "python_executable": [None, "ANY"],
         "python_ext": [None, "ANY"]
     }
     default_options = {
@@ -25,6 +26,7 @@ class OpenQLConan(ConanFile):
         "debug_symbols": False,
         "disable_unitary": True,
         "python_dir": None,
+        "python_executable": None,
         "python_ext": None
     }
 
@@ -44,6 +46,7 @@ def build_requirements(self):
             if self.settings.arch != "armv8":
                 self.tool_requires("flex/2.6.4")
                 self.tool_requires("bison/3.8.2")
+        self.requires("range-v3/0.12.0")
         if self.settings.arch != "armv8":
             self.tool_requires("zulu-openjdk/11.0.19")
         if self.options.build_tests:
@@ -76,6 +79,7 @@ def generate(self):
         tc.variables["OPENQL_DEBUG_SYMBOLS"] = self.options.debug_symbols
         tc.variables["OPENQL_PYTHON_DIR"] = self.options.python_dir
         tc.variables["OPENQL_PYTHON_EXT"] = self.options.python_ext
+        tc.variables["PYTHON_EXECUTABLE"] = not self.options.python_executable
         tc.variables["WITH_UNITARY_DECOMPOSITION"] = not self.options.disable_unitary
         tc.generate()
 

include/ql/ir/cqasm/read.h

@@ -83,20 +83,6 @@ struct ReadOptions {
  * the filename if one exists for the purpose of generating better error
  * messages.
  */
-void read_v1(
-    const Ref &ir,
-    const utils::Str &data,
-    const utils::Str &fname = "<unknown>",
-    const ReadOptions &options = {}
-);
-
-void read_v3(
-    const Ref &ir,
-    const utils::Str &data,
-    const utils::Str &fname = "<unknown>",
-    const ReadOptions &options = {}
-);
-
 void read(
     const Ref &ir,
     const utils::Str &data,

include/ql/ir/cqasm/write.h

@@ -6,9 +6,10 @@
 
 #include "ql/ir/ir.h"
 
-namespace ql {
-namespace ir {
-namespace cqasm {
+#include <compare>  // strong_ordering
+
+
+namespace ql::ir::cqasm {
 
 /**
  * The manner in which wait instructions are printed.
@@ -135,6 +136,6 @@ utils::Str to_string(
     const WriteOptions &options = {}
 );
 
-} // namespace cqasm
-} // namespace ir
-} // namespace ql
+std::strong_ordering version_compare(const utils::Vec<utils::UInt> &lhs, const utils::Vec<utils::UInt> &rhs);
+
+} // namespace ql::ir::cqasm

include/ql/version.h

@@ -7,4 +7,4 @@
  *
  * OPENQL_VERSION_STRING is also decoded by setup.py
 */
-#define OPENQL_VERSION_STRING "0.11.1"
+#define OPENQL_VERSION_STRING "0.11.2"