From ec28207a551be13dd6ad0289188e28039634efcc Mon Sep 17 00:00:00 2001
From: pbialecki <piotr.bialecki@hotmail.de>
Date: Wed, 9 Nov 2022 01:16:06 -0800
Subject: [PATCH 1/3] build libtorch and manywheel for 11.8

---
 .github/workflows/build-libtorch-images.yml  | 2 +-
 .github/workflows/build-manywheel-images.yml | 2 +-
 common/install_magma.sh                      | 3 +++
 libtorch/Dockerfile                          | 4 ++++
 libtorch/build_all_docker.sh                 | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-libtorch-images.yml b/.github/workflows/build-libtorch-images.yml
index 686ab577b..b3a27fabf 100644
--- a/.github/workflows/build-libtorch-images.yml
+++ b/.github/workflows/build-libtorch-images.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        cuda_version: ["11.7", "11.6"]
+        cuda_version: ["11.8", "11.7", "11.6"]
     env:
       GPU_ARCH_TYPE: cuda
       GPU_ARCH_VERSION: ${{ matrix.cuda_version }}
diff --git a/.github/workflows/build-manywheel-images.yml b/.github/workflows/build-manywheel-images.yml
index 9bca4ee4c..86f778808 100644
--- a/.github/workflows/build-manywheel-images.yml
+++ b/.github/workflows/build-manywheel-images.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        cuda_version: ["11.7", "11.6"]
+        cuda_version: ["11.8", "11.7", "11.6"]
     env:
       GPU_ARCH_TYPE: cuda
       GPU_ARCH_VERSION: ${{ matrix.cuda_version }}
diff --git a/common/install_magma.sh b/common/install_magma.sh
index 5d14dbfe2..91f4b42dc 100644
--- a/common/install_magma.sh
+++ b/common/install_magma.sh
@@ -14,6 +14,9 @@ function do_install() {
     elif [[ ${cuda_version_nodot} == 117 ]]; then
 	MAGMA_VERSION="2.6.1"
 	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-0.tar.bz2"
+    elif [[ ${cuda_version_nodot} == 118 ]]; then
+	MAGMA_VERSION="2.6.1"
+	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-0.tar.bz2"
     else
         magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
     fi
diff --git a/libtorch/Dockerfile b/libtorch/Dockerfile
index 9e2b3f696..b14048ce3 100644
--- a/libtorch/Dockerfile
+++ b/libtorch/Dockerfile
@@ -52,6 +52,10 @@ FROM cuda as cuda11.7
 RUN bash ./install_cuda.sh 11.7
 RUN bash ./install_magma.sh 11.7
 
+FROM cuda as cuda11.8
+RUN bash ./install_cuda.sh 11.8
+RUN bash ./install_magma.sh 11.8
+
 FROM cpu as rocm
 ARG PYTORCH_ROCM_ARCH
 ENV PYTORCH_ROCM_ARCH ${PYTORCH_ROCM_ARCH}
diff --git a/libtorch/build_all_docker.sh b/libtorch/build_all_docker.sh
index ed45ceb60..28baee88c 100755
--- a/libtorch/build_all_docker.sh
+++ b/libtorch/build_all_docker.sh
@@ -4,7 +4,7 @@ set -eou pipefail
 
 TOPDIR=$(git rev-parse --show-toplevel)
 
-for cuda_version in 11.7 11.6; do
+for cuda_version in 11.8 11.7 11.6; do
     GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/libtorch/build_docker.sh"
 done
 

From 2c175b41ce30780e0409764ef4c56cdd3547131f Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Thu, 10 Nov 2022 12:59:29 -0500
Subject: [PATCH 2/3] Update common/install_magma.sh

---
 common/install_magma.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/install_magma.sh b/common/install_magma.sh
index 91f4b42dc..ffe738281 100644
--- a/common/install_magma.sh
+++ b/common/install_magma.sh
@@ -16,7 +16,7 @@ function do_install() {
 	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-0.tar.bz2"
     elif [[ ${cuda_version_nodot} == 118 ]]; then
 	MAGMA_VERSION="2.6.1"
-	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-0.tar.bz2"
+	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
     else
         magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
     fi

From 736d8e16c583beb23ffee15f03c37736e944fd72 Mon Sep 17 00:00:00 2001
From: pbialecki <piotr.bialecki@hotmail.de>
Date: Tue, 15 Nov 2022 23:53:41 -0800
Subject: [PATCH 3/3] use magma-cuda build-1 by default; remove CUDA 10.2-11.5
 builds

---
 common/install_magma.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/common/install_magma.sh b/common/install_magma.sh
index ffe738281..b524c920e 100644
--- a/common/install_magma.sh
+++ b/common/install_magma.sh
@@ -7,20 +7,10 @@ MAGMA_VERSION="2.5.2"
 function do_install() {
     cuda_version=$1
     cuda_version_nodot=${1/./}
-    
-    if [[ ${cuda_version_nodot} == 116 ]]; then
-        MAGMA_VERSION="2.6.1"
-        magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-0.tar.bz2"
-    elif [[ ${cuda_version_nodot} == 117 ]]; then
-	MAGMA_VERSION="2.6.1"
-	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-0.tar.bz2"
-    elif [[ ${cuda_version_nodot} == 118 ]]; then
-	MAGMA_VERSION="2.6.1"
-	magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
-    else
-        magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
-    fi
-    
+
+    MAGMA_VERSION="2.6.1"
+    magma_archive="magma-cuda${cuda_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
+
     cuda_dir="/usr/local/cuda-${cuda_version}"
     (
         set -x