From 25cafeefef37987c27ce91b68b2dc97792ac2e4f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 28 Sep 2023 21:40:56 -0400 Subject: [PATCH 1/4] revert #2359 Signed-off-by: Jinzhe Zeng --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a578835fbd..9e8cf615da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,8 +131,7 @@ repair-wheel-command = "auditwheel repair --exclude libtensorflow_framework.so.2 environment-pass = ["CIBW_BUILD", "DP_VARIANT"] environment = { PIP_PREFER_BINARY="1", DP_VARIANT="cuda", DP_LAMMPS_VERSION="stable_2Aug2023_update1", DP_ENABLE_IPI="1", MPI_HOME="/usr/lib64/mpich", PATH="/usr/lib64/mpich/bin:$PATH" } before-all = [ - """{ if [ "$(uname -m)" = "x86_64" ] ; then curl https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run -O && bash cuda_11.8.0_520.61.05_linux.run --silent --toolkit; fi }""", - "yum install -y mpich-devel", +"""{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-11-8; fi }""", "yum install -y mpich-devel", ] [tool.cibuildwheel.windows] From 4620f0d103fa91a66278117c835e9296af615df0 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 28 Sep 2023 21:42:03 -0400 Subject: [PATCH 2/4] format Signed-off-by: Jinzhe Zeng --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9e8cf615da..9bd4bed6ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,7 +131,8 @@ repair-wheel-command = "auditwheel repair --exclude libtensorflow_framework.so.2 environment-pass = ["CIBW_BUILD", "DP_VARIANT"] environment = { PIP_PREFER_BINARY="1", DP_VARIANT="cuda", DP_LAMMPS_VERSION="stable_2Aug2023_update1", DP_ENABLE_IPI="1", MPI_HOME="/usr/lib64/mpich", PATH="/usr/lib64/mpich/bin:$PATH" } before-all = [ -"""{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-11-8; fi }""", "yum install -y mpich-devel", + """{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-11-8; fi }""", + "yum install -y mpich-devel", ] [tool.cibuildwheel.windows] From 62a819e2e61f13d0e1616bb2b92b07e58c7712ad Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 28 Sep 2023 21:50:03 -0400 Subject: [PATCH 3/4] only install nvcc and runtime Signed-off-by: Jinzhe Zeng --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9bd4bed6ad..097fb77f50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,7 +131,7 @@ repair-wheel-command = "auditwheel repair --exclude libtensorflow_framework.so.2 environment-pass = ["CIBW_BUILD", "DP_VARIANT"] environment = { PIP_PREFER_BINARY="1", DP_VARIANT="cuda", DP_LAMMPS_VERSION="stable_2Aug2023_update1", DP_ENABLE_IPI="1", MPI_HOME="/usr/lib64/mpich", PATH="/usr/lib64/mpich/bin:$PATH" } before-all = [ - """{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-11-8; fi }""", + """{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-nvcc-11-8 cuda-runtime-11-8; fi }""", "yum install -y mpich-devel", ] From 538c287dd61d75ba2437b894c64cbb915fad2d04 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 28 Sep 2023 22:07:37 -0400 Subject: [PATCH 4/4] fix library name Signed-off-by: Jinzhe Zeng --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 097fb77f50..191c96f455 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,7 +131,7 @@ repair-wheel-command = "auditwheel repair --exclude libtensorflow_framework.so.2 environment-pass = ["CIBW_BUILD", "DP_VARIANT"] environment = { PIP_PREFER_BINARY="1", DP_VARIANT="cuda", DP_LAMMPS_VERSION="stable_2Aug2023_update1", DP_ENABLE_IPI="1", MPI_HOME="/usr/lib64/mpich", PATH="/usr/lib64/mpich/bin:$PATH" } before-all = [ - """{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-nvcc-11-8 cuda-runtime-11-8; fi }""", + """{ if [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-nvcc-11-8 cuda-cudart-devel-11-8; fi }""", "yum install -y mpich-devel", ]