From 15cd3931bb304b151ae60241bfbcddbcd1c32943 Mon Sep 17 00:00:00 2001 From: Gadi Aleksandrowicz Date: Mon, 25 Nov 2024 14:19:58 +0200 Subject: [PATCH 1/6] Small change to trigger github actions --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a0a971dd58..64d0d81483 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -185,7 +185,7 @@ jobs: - name: Install cibuildwheel run: | python -m pip install cibuildwheel==2.16.2 - - name: Build wheels + - name: Build wheel env: CIBW_BEFORE_ALL: "sed -i -e 's/^mirrorlist/#mirrorlist/' -e 's/^#baseurl/baseurl/' -e 's/mirror.centos.org/vault.centos.org/' /etc/yum.repos.d/*.repo && yum install -y yum-utils wget && wget -q https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda-repo-rhel8-12-5-local-12.5.1_555.42.06-1.x86_64.rpm && rpm -i cuda-repo-rhel8-12-5-local-12.5.1_555.42.06-1.x86_64.rpm && yum clean all && yum -y install cuda-toolkit-12-5 && yum -y install openblas-devel && yum clean all" CIBW_BEFORE_BUILD : "pip install nvidia-cuda-runtime-cu12 nvidia-nvjitlink-cu12 nvidia-cublas-cu12 nvidia-cusolver-cu12 nvidia-cusparse-cu12 cuquantum-cu12" From ba23e87e0f0cdb57907f7e74f0c7efd35bbd067b Mon Sep 17 00:00:00 2001 From: Gadi Aleksandrowicz Date: Wed, 27 Nov 2024 16:25:19 +0200 Subject: [PATCH 2/6] Attempting to discern if the 2_28 problems can be solved by removing the repo sed hack --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3c928d538a..69216b4247 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,8 +10,8 @@ requires = [ build-backend = "setuptools.build_meta" [tool.cibuildwheel] -manylinux-x86_64-image = "manylinux2014" -manylinux-i686-image = "manylinux2014" +manylinux-x86_64-image = "manylinux_2_28" +manylinux-i686-image = "manylinux_2_28" skip = "pp* cp36* cp37* *musllinux* cp38-macosx_arm64" test-skip = "cp3*-win32 cp3*-manylinux_i686" test-command = "python {project}/tools/verify_wheels.py" @@ -22,7 +22,7 @@ test-command = "python {project}/tools/verify_wheels.py" before-test = "pip install --only-binary=numpy,scipy numpy scipy" [tool.cibuildwheel.linux] -before-all = "sed -i -e 's/^mirrorlist/#mirrorlist/' -e 's/^#baseurl/baseurl/' -e 's/mirror.centos.org/vault.centos.org/' /etc/yum.repos.d/*.repo && yum install -y openblas-devel" +before-all = "yum install -y openblas-devel" [tool.cibuildwheel.windows] environment = { CMAKE_GENERATOR = "Visual Studio 16 2019"} From 986e0f7d8d344678341a2a0dc40e398ff082668a Mon Sep 17 00:00:00 2001 From: Gadi Aleksandrowicz Date: Wed, 27 Nov 2024 19:01:28 +0200 Subject: [PATCH 3/6] Try removing the manylinux params and let cibuildwheel handle this --- pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 69216b4247..d10a006b82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,8 +10,6 @@ requires = [ build-backend = "setuptools.build_meta" [tool.cibuildwheel] -manylinux-x86_64-image = "manylinux_2_28" -manylinux-i686-image = "manylinux_2_28" skip = "pp* cp36* cp37* *musllinux* cp38-macosx_arm64" test-skip = "cp3*-win32 cp3*-manylinux_i686" test-command = "python {project}/tools/verify_wheels.py" From fc2eb9e3b0a9a4275778784ab0f5435569ab76cd Mon Sep 17 00:00:00 2001 From: Gadi Aleksandrowicz Date: Wed, 27 Nov 2024 19:05:20 +0200 Subject: [PATCH 4/6] Try to be more explicit in the manylinux_2_28 lines --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d10a006b82..2a08abdb40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,8 @@ requires = [ build-backend = "setuptools.build_meta" [tool.cibuildwheel] +manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28" +manylinux-i686-image = "quay.io/pypa/manylinux_2_28" skip = "pp* cp36* cp37* *musllinux* cp38-macosx_arm64" test-skip = "cp3*-win32 cp3*-manylinux_i686" test-command = "python {project}/tools/verify_wheels.py" From b1976c5c142e0a1066439987bb5ef4d0ac45cafe Mon Sep 17 00:00:00 2001 From: Gadi Aleksandrowicz Date: Wed, 27 Nov 2024 19:12:47 +0200 Subject: [PATCH 5/6] Even more explicit --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2a08abdb40..0763e73b0c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,8 +10,8 @@ requires = [ build-backend = "setuptools.build_meta" [tool.cibuildwheel] -manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28" -manylinux-i686-image = "quay.io/pypa/manylinux_2_28" +manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64" +manylinux-i686-image = "quay.io/pypa/manylinux_2_24_i686" skip = "pp* cp36* cp37* *musllinux* cp38-macosx_arm64" test-skip = "cp3*-win32 cp3*-manylinux_i686" test-command = "python {project}/tools/verify_wheels.py" From da62e9334fbe6b8a235e52793fbb79f31c8196d7 Mon Sep 17 00:00:00 2001 From: Gadi Aleksandrowicz Date: Wed, 27 Nov 2024 19:21:03 +0200 Subject: [PATCH 6/6] Remove the sed hack from the gpu builds --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 365904df88..f58991baf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: python -m pip install cibuildwheel==2.17.0 - name: Build wheels env: - CIBW_BEFORE_ALL: "sed -i -e 's/^mirrorlist/#mirrorlist/' -e 's/^#baseurl/baseurl/' -e 's/mirror.centos.org/vault.centos.org/' /etc/yum.repos.d/*.repo && yum install -y yum-utils wget && wget -q https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda-repo-rhel7-11-8-local-11.8.0_520.61.05-1.x86_64.rpm && rpm -i cuda-repo-rhel7-11-8-local-11.8.0_520.61.05-1.x86_64.rpm && yum clean all && yum -y install cuda && yum -y install openblas-devel && yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo && yum clean all" + CIBW_BEFORE_ALL: "yum install -y yum-utils wget && wget -q https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda-repo-rhel7-11-8-local-11.8.0_520.61.05-1.x86_64.rpm && rpm -i cuda-repo-rhel7-11-8-local-11.8.0_520.61.05-1.x86_64.rpm && yum clean all && yum -y install cuda && yum -y install openblas-devel && yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo && yum clean all" CIBW_BEFORE_BUILD : "pip cache purge && pip install nvidia-cuda-runtime-cu11 nvidia-cublas-cu11 nvidia-cusolver-cu11 nvidia-cusparse-cu11 cuquantum-cu11" CIBW_SKIP: "*-manylinux_i686 pp* cp36* cp37* cp38* cp39* cp310* cp311* *musllinux*" CIBW_ENVIRONMENT: QISKIT_AER_PACKAGE_NAME=qiskit-aer-gpu-cu11 QISKIT_AER_CUDA_MAJOR=11 CMAKE_VERBOSE_MAKEFILE=true AER_THRUST_BACKEND=CUDA CUDACXX=/usr/local/cuda/bin/nvcc AER_CUDA_ARCH="7.0 7.2 7.5 8.0 8.6 8.7" AER_PYTHON_CUDA_ROOT=/opt/_internal AER_CIBUILD=true @@ -109,7 +109,7 @@ jobs: python -m pip install cibuildwheel==2.17.0 - name: Build wheels env: - CIBW_BEFORE_ALL: "sed -i -e 's/^mirrorlist/#mirrorlist/' -e 's/^#baseurl/baseurl/' -e 's/mirror.centos.org/vault.centos.org/' /etc/yum.repos.d/*.repo && yum install -y yum-utils wget && wget -q https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda-repo-rhel8-12-5-local-12.5.1_555.42.06-1.x86_64.rpm && rpm -i cuda-repo-rhel8-12-5-local-12.5.1_555.42.06-1.x86_64.rpm && yum clean all && yum -y install cuda-toolkit-12-5 && yum -y install openblas-devel && yum clean all" + CIBW_BEFORE_ALL: "yum install -y yum-utils wget && wget -q https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda-repo-rhel8-12-5-local-12.5.1_555.42.06-1.x86_64.rpm && rpm -i cuda-repo-rhel8-12-5-local-12.5.1_555.42.06-1.x86_64.rpm && yum clean all && yum -y install cuda-toolkit-12-5 && yum -y install openblas-devel && yum clean all" CIBW_BEFORE_BUILD : "pip cache purge && pip install nvidia-cuda-runtime-cu12 nvidia-nvjitlink-cu12 nvidia-cublas-cu12 nvidia-cusolver-cu12 nvidia-cusparse-cu12 cuquantum-cu12" CIBW_SKIP: "*-manylinux_i686 pp* cp36* cp37* cp38* cp39* cp310* cp311* *musllinux*" CIBW_ENVIRONMENT: QISKIT_AER_PACKAGE_NAME=qiskit-aer-gpu QISKIT_AER_CUDA_MAJOR=12 CMAKE_VERBOSE_MAKEFILE=true AER_THRUST_BACKEND=CUDA CUDACXX=/usr/local/cuda/bin/nvcc AER_CUDA_ARCH="7.0 7.2 7.5 8.0 8.6 8.7 8.9 9.0" AER_PYTHON_CUDA_ROOT=/opt/_internal AER_CIBUILD=true