From 08c64ed6203d389a83a9c5c8bbe7165b8fdb0c54 Mon Sep 17 00:00:00 2001
From: "Nick J. Browning" <nickjbrowning@gmail.com>
Date: Mon, 2 Dec 2024 00:00:35 +0100
Subject: [PATCH] updates.

---
 .github/workflows/main.yaml             |  2 --
 scripts/manylinux2014_x86_64/Dockerfile | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index cff8985..9e0f2b0 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -39,9 +39,7 @@ jobs:
         docker build --no-cache \
         -t manylinux2014_${{ matrix.cibw-arch }} \
         --build-arg PYTHON_VER=${{ matrix.python-version }} \
-        --build-arg PY_VER=${{ env.PYVERSION }} \
         --build-arg CUDA_VER=${{ matrix.cuda-version }} \
-        --build-arg CU_VER=${{ env.CUVERSION }} \
         --build-arg PYTORCH_VERSION=${{ matrix.pytorch-version }} \
         scripts/manylinux2014_${{ matrix.cibw-arch }}
     
diff --git a/scripts/manylinux2014_x86_64/Dockerfile b/scripts/manylinux2014_x86_64/Dockerfile
index 0827d46..88827d2 100644
--- a/scripts/manylinux2014_x86_64/Dockerfile
+++ b/scripts/manylinux2014_x86_64/Dockerfile
@@ -2,16 +2,18 @@ FROM quay.io/pypa/manylinux2014_x86_64
 
 # Set environment variables for Python and CUDA versions
 ARG PYTHON_VER="3.11"
-ARG PY_VER="311"
 ARG CUDA_VER="12.4"
-ARG CU_VER="124"
 ARG PYTORCH_VERSION="2.4.1"
 
+RUN CUDA_VER_DASH=${CUDA_VER//./-}
+RUN CUDA_VER_NO_DOT=${CUDA_VER//./}
+RUN PYTHON_VER_NO_DOT=${PYTHON_VER//./}
+
 # Install system dependencies and CUDA
 RUN yum install -y yum-utils gcc gcc-c++ make zlib-devel bzip2-devel libffi-devel \
     && yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo \
     && yum install -y \
-    cuda-toolkit-${CUDA_VER} \
+    cuda-toolkit-${CUDA_VER_DASH} \
     && yum clean all \
     && rm -rf /var/cache/yum/* \
     && echo "/usr/local/cuda/lib64" >> /etc/ld.so.conf.d/999_nvidia_cuda.conf
@@ -21,8 +23,8 @@ RUN yum install -y yum-utils gcc gcc-c++ make zlib-devel bzip2-devel libffi-deve
 #RUN ln -sf /opt/python/cp311-cp311/bin/python3.11 /opt/python/cp311-cp311/bin/python
 
 # Set Python version environment variables dynamically
-ENV PATH="/opt/python/cp${PY_VER}-cp${PY_VER}/bin:${PATH}"
-RUN ln -sf /opt/python/cp${PY_VER}-cp${PY_VER}/bin/python${PYTHON_VER} /opt/python/cp${PY_VER}-cp${PY_VER}/bin/python
+ENV PATH="/opt/python/cp${PYTHON_VER_NO_DOT}-cp${PYTHON_VER_NO_DOT}/bin:${PATH}"
+RUN ln -sf /opt/python/cp${PYTHON_VER_NO_DOT}-cp${PYTHON_VER_NO_DOT}/bin/python${PYTHON_VER} /opt/python/cp${PYTHON_VER_NO_DOT}-cp${PYTHON_VER_NO_DOT}/bin/python
 
 RUN python -m ensurepip --upgrade
 
@@ -42,7 +44,7 @@ RUN echo "CUDA_HOME: ${CUDA_HOME}" && \
 
 #RUN pip install torch==2.4.1+cu124 --extra-index-url https://download.pytorch.org/whl/cu124
 #RUN pip install numpy cmake
-RUN pip install torch==${PYTORCH_VERSION}+cu${CU_VER} --extra-index-url https://download.pytorch.org/whl/cu${CU_VER}
+RUN pip install torch==${PYTORCH_VERSION}+cu${CUDA_VER_NO_DOT} --extra-index-url https://download.pytorch.org/whl/cu${CUDA_VER_NO_DOT}
 RUN pip install numpy cmake
 
 RUN mkdir /workspace