From 2b26ba62ae83381d777f0079262689f4c40acbb9 Mon Sep 17 00:00:00 2001 From: Marvin Erdmann <106394656+Marvmann@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:05:48 +0100 Subject: [PATCH 1/5] Upgrade pip in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 44574f98..0572fa33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.12 - +RUN pip install --upgrade pip COPY . . RUN pip install --default-timeout=1800 -r .settings/requirements_full.txt From b314354275fadde5632db11c0a460f40916028d6 Mon Sep 17 00:00:00 2001 From: Marvin Erdmann <106394656+Marvmann@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:15:43 +0100 Subject: [PATCH 2/5] Update container_build_publish.yml --- .github/workflows/container_build_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_build_publish.yml b/.github/workflows/container_build_publish.yml index 0007962f..ac4bb3a8 100644 --- a/.github/workflows/container_build_publish.yml +++ b/.github/workflows/container_build_publish.yml @@ -4,7 +4,7 @@ name: Create and publish a QUARK Docker image # Configures this workflow to run every time a change is pushed to the branch called `main` or `dev`. on: push: - branches: ['main', 'dev'] + branches: ['main', 'dev', 'Unit_test_fix'] release: types: [ published ] From 6830aaf54045e9f49e7c50f4d6416b8d43cd3927 Mon Sep 17 00:00:00 2001 From: Marvin Erdmann Date: Fri, 13 Dec 2024 10:28:33 +0100 Subject: [PATCH 3/5] Temporarily remove ARM builds in Docker (until pyqubo >1.4 is available) --- .github/workflows/container_build_publish.yml | 4 +++- README.md | 6 ++++++ docs/tutorial.rst | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_build_publish.yml b/.github/workflows/container_build_publish.yml index ac4bb3a8..74a07fd7 100644 --- a/.github/workflows/container_build_publish.yml +++ b/.github/workflows/container_build_publish.yml @@ -72,6 +72,8 @@ jobs: context: . push: true # Start with a limited number of platforms - platforms: linux/amd64,linux/arm64 + # ARM builds are (temporarily) removed in release 2.1.3 because pyqubo 1.5.0 is unavailable for this platform + # platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/README.md b/README.md index 3551c0c9..8b198ea5 100644 --- a/README.md +++ b/README.md @@ -248,6 +248,12 @@ After making sure your docker daemon is running, you can run the container: docker run -it --rm ghcr.io/quark-framework/quark ``` +> __Note__: ARM builds are (temporarily) removed in release 2.1.3 because pyqubo 1.5.0 is unavailable for this platform +> at the moment. This means if you want to run QUARK as a container on a machine with a chip from this +> [list](https://en.wikipedia.org/wiki/List_of_ARM_processors) you might face problems. Please feel free to +> [open an issue](https://github.com/QUARK-framework/QUARK/issues/new), so we can work on a tailored workaround until +> the latest version of pyqubo is available on ARM platforms. + You can also build the docker image locally like: ``` docker build -t ghcr.io/quark-framework/quark . diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 27c923e1..5b6bdfda 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -267,6 +267,12 @@ After making sure your docker daemon is running, you can run the container: docker run -it --rm ghcr.io/quark-framework/quark +**Note**: ARM builds are (temporarily) removed in release 2.1.3 because pyqubo 1.5.0 is unavailable for this platform at +the moment. This means if you want to run QUARK as a container on a machine with a chip from this +`list `_ you might face problems. Please feel free to `open an +issue `_, so we can work on a tailored workaround until the latest +version of pyqubo is available on ARM platforms. + You can also build the docker image locally like: :: From f6cf34ce6e677272b409d46f043a72ede9db0847 Mon Sep 17 00:00:00 2001 From: Marvin Erdmann Date: Fri, 13 Dec 2024 10:56:59 +0100 Subject: [PATCH 4/5] Bugfix unit test for MIS --- tests/modules/applications/optimization/MIS/test_MIS.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/modules/applications/optimization/MIS/test_MIS.py b/tests/modules/applications/optimization/MIS/test_MIS.py index 73ff6cb1..2230a96f 100644 --- a/tests/modules/applications/optimization/MIS/test_MIS.py +++ b/tests/modules/applications/optimization/MIS/test_MIS.py @@ -49,9 +49,9 @@ def test_process_solution(self): def test_validate(self): logging.disable(logging.WARNING) - self.mis_instance.application = nx.Graph() - self.mis_instance.application.add_nodes_from([0, 1, 2]) - self.mis_instance.application.add_edges_from([(0, 1), (1, 2)]) + self.mis_instance.graph = nx.Graph() + self.mis_instance.graph.add_nodes_from([0, 1, 2]) + self.mis_instance.graph.add_edges_from([(0, 1), (1, 2)]) valid_solution = [0, 2] is_valid, validation_time = self.mis_instance.validate(valid_solution) From 717d8b4af98104094f7205844c2e64f536adc239 Mon Sep 17 00:00:00 2001 From: Marvin Erdmann Date: Fri, 13 Dec 2024 11:17:39 +0100 Subject: [PATCH 5/5] . --- .github/workflows/container_build_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_build_publish.yml b/.github/workflows/container_build_publish.yml index 74a07fd7..07783916 100644 --- a/.github/workflows/container_build_publish.yml +++ b/.github/workflows/container_build_publish.yml @@ -4,7 +4,7 @@ name: Create and publish a QUARK Docker image # Configures this workflow to run every time a change is pushed to the branch called `main` or `dev`. on: push: - branches: ['main', 'dev', 'Unit_test_fix'] + branches: ['main', 'dev'] release: types: [ published ]