From 15e597c8437048e50a16fd0a43a24b6618fa81ae Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 09:57:51 -0400 Subject: [PATCH 01/12] Update requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f945837dca..08be6260f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ninja flaky numpy -pennylane>=0.15 +git+https://github.com/PennyLaneAI/pennylane.git@master pybind11 pytest pytest-cov From c030f1c585b42d287831bc9b7e770536dd265011 Mon Sep 17 00:00:00 2001 From: Dev version update bot Date: Fri, 12 Aug 2022 14:04:23 +0000 Subject: [PATCH 02/12] Auto update version --- pennylane_lightning/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index 5808396e8d..e309310307 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.25.0-dev10" +__version__ = "0.25.0-dev11" From d8df62e4b951b456cde96bdabfad42733d789592 Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 10:12:24 -0400 Subject: [PATCH 03/12] update changelog --- .github/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 9c24bed7fe..d795f48653 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -31,6 +31,9 @@ * Test updates to reflect new additions to PennyLane. [(#318)](https://github.com/PennyLaneAI/pennylane-lightning/pull/318) +* Lightning requirements updated to point to PennyLane master version. +[(#330)](https://github.com/PennyLaneAI/pennylane-lightning/pull/330) + ### Contributors This release contains contributions from (in alphabetical order): From d00cbd67fa82aaadf1b1e6bf64040cc4836a1f62 Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 10:19:56 -0400 Subject: [PATCH 04/12] update tests and benchmarks --- .github/workflows/benchmarks.yml | 1 - .github/workflows/tests_linux.yml | 4 ---- .github/workflows/tests_without_binary.yml | 2 -- 3 files changed, 7 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index d1ef5ccb58..db09ec1d46 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -34,7 +34,6 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install matplotlib - pip install git+https://github.com/PennyLaneAI/pennylane.git@master - name: Install lightning.qubit device (master) run: | diff --git a/.github/workflows/tests_linux.yml b/.github/workflows/tests_linux.yml index 6c15acd483..0380e88391 100644 --- a/.github/workflows/tests_linux.yml +++ b/.github/workflows/tests_linux.yml @@ -231,8 +231,6 @@ jobs: cd main python -m pip install --upgrade pip pip install -r requirements.txt - pip uninstall pennylane -y - pip install git+https://github.com/PennyLaneAI/pennylane.git - name: Install ML libraries for interfaces run: | @@ -286,8 +284,6 @@ jobs: cd main python -m pip install --upgrade pip pip install -r requirements.txt - pip uninstall pennylane -y - pip install git+https://github.com/PennyLaneAI/pennylane.git - name: Install ML libraries for interfaces run: | diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml index dd29bdc059..da5a372fc7 100644 --- a/.github/workflows/tests_without_binary.yml +++ b/.github/workflows/tests_without_binary.yml @@ -37,8 +37,6 @@ jobs: cd main python -m pip install --upgrade pip pip install -r requirements.txt - pip uninstall pennylane -y - pip install git+https://github.com/PennyLaneAI/pennylane.git - name: Install lightning.qubit device run: | From d0dbbbfd54830234d24a56939c55bde903b7138d Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 12:08:58 -0400 Subject: [PATCH 05/12] update dockerfile --- docker/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2e67eed946..2926a96edd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,6 +36,13 @@ RUN apt-get update \ && ccache --set-config=cache_dir=/opt/ccache \ && python3 -m venv /opt/venv +RUN apt-get update \ + && apt-get upgrade -y + +# Install and setup gcc 10. +RUN apt-get install gcc-10 g++-10 cpp-10 -y \ + && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 + ENV PATH="/opt/venv/bin:$PATH" # Setup and build pennylane-lightning From f61a8663615cd7eac9d8d42ea0e97e5d59527cde Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 12:11:08 -0400 Subject: [PATCH 06/12] update changelog --- .github/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index d795f48653..43b50ef06e 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -31,7 +31,7 @@ * Test updates to reflect new additions to PennyLane. [(#318)](https://github.com/PennyLaneAI/pennylane-lightning/pull/318) -* Lightning requirements updated to point to PennyLane master version. +* Updates to lightning requirements and dockerfile. [(#330)](https://github.com/PennyLaneAI/pennylane-lightning/pull/330) ### Contributors From dddf3765d20e80e3f714a2511263b41575024488 Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 12:18:09 -0400 Subject: [PATCH 07/12] improve dockerfile --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2926a96edd..10c164e07b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,7 +40,8 @@ RUN apt-get update \ && apt-get upgrade -y # Install and setup gcc 10. -RUN apt-get install gcc-10 g++-10 cpp-10 -y \ +RUN apt-get install --no-install-recommends -y gcc-10 g++-10 cpp-10 \ + && apt-get clean \ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 ENV PATH="/opt/venv/bin:$PATH" From 10981d7b8a8c496e52f6b22ed3b4ef38243d74ea Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 12:32:21 -0400 Subject: [PATCH 08/12] improve dockerfile --- docker/Dockerfile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 10c164e07b..a4ae2b0407 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,21 +29,15 @@ RUN apt-get update \ python3-pip \ python3-venv \ python3-dev \ + gcc-10 g++-10 cpp-10 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ + && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \ && /usr/sbin/update-ccache-symlinks \ && mkdir /opt/ccache \ && ccache --set-config=cache_dir=/opt/ccache \ && python3 -m venv /opt/venv -RUN apt-get update \ - && apt-get upgrade -y - -# Install and setup gcc 10. -RUN apt-get install --no-install-recommends -y gcc-10 g++-10 cpp-10 \ - && apt-get clean \ - && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 - ENV PATH="/opt/venv/bin:$PATH" # Setup and build pennylane-lightning @@ -52,10 +46,6 @@ WORKDIR /opt/pennylane-lightning COPY . . RUN pip install --no-cache-dir wheel \ - pytest \ - pytest-cov \ - pytest-mock \ - flaky \ sphinx \ && pip install --no-cache-dir -r requirements.txt \ && pip uninstall -y PennyLane_Lightning \ From 249985a96ba02dc6587cb665f57afb8072857741 Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Fri, 12 Aug 2022 14:37:24 -0400 Subject: [PATCH 09/12] Trigger CI From afc7e8ac4c22634de1bde2f3d21b3270fcfb54cb Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Mon, 15 Aug 2022 12:10:59 -0400 Subject: [PATCH 10/12] update requirements.txt to requirements-dev.txt --- .github/workflows/benchmarks.yml | 2 +- .github/workflows/tests_linux.yml | 4 ++-- .github/workflows/tests_without_binary.yml | 2 +- docker/Dockerfile | 2 +- requirements-dev.txt | 8 ++++++++ requirements.txt | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 requirements-dev.txt diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index db09ec1d46..6c180e61db 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -32,7 +32,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements-dev.txt pip install matplotlib - name: Install lightning.qubit device (master) diff --git a/.github/workflows/tests_linux.yml b/.github/workflows/tests_linux.yml index 0380e88391..e0030365bb 100644 --- a/.github/workflows/tests_linux.yml +++ b/.github/workflows/tests_linux.yml @@ -230,7 +230,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements-dev.txt - name: Install ML libraries for interfaces run: | @@ -283,7 +283,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements-dev.txt - name: Install ML libraries for interfaces run: | diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml index da5a372fc7..934d5072b0 100644 --- a/.github/workflows/tests_without_binary.yml +++ b/.github/workflows/tests_without_binary.yml @@ -36,7 +36,7 @@ jobs: run: | cd main python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements-dev.txt - name: Install lightning.qubit device run: | diff --git a/docker/Dockerfile b/docker/Dockerfile index a4ae2b0407..bce3b788a0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -47,7 +47,7 @@ COPY . . RUN pip install --no-cache-dir wheel \ sphinx \ - && pip install --no-cache-dir -r requirements.txt \ + && pip install --no-cache-dir -r requirements-dev.txt \ && pip uninstall -y PennyLane_Lightning \ && make install \ && make test-python \ diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000000..08be6260f0 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,8 @@ +ninja +flaky +numpy +git+https://github.com/PennyLaneAI/pennylane.git@master +pybind11 +pytest +pytest-cov +pytest-mock diff --git a/requirements.txt b/requirements.txt index 08be6260f0..5cace613bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ninja flaky numpy -git+https://github.com/PennyLaneAI/pennylane.git@master +pennylane~=0.26 pybind11 pytest pytest-cov From 2e674bcdd75b71be3e3c140144bb85787f43bc8e Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Mon, 15 Aug 2022 12:38:49 -0400 Subject: [PATCH 11/12] fix pennylane version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5cace613bc..de0d3cba80 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ninja flaky numpy -pennylane~=0.26 +pennylane~=0.25 pybind11 pytest pytest-cov From 0693564264d4a520453bf87a5d0ba5cb87992451 Mon Sep 17 00:00:00 2001 From: AmintorDusko Date: Tue, 16 Aug 2022 08:44:15 -0400 Subject: [PATCH 12/12] Trigger CI