From 79348795f246219ca8d569698e282b1b82f586f6 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.harris@nanoporetech.com>
Date: Thu, 4 Apr 2024 09:36:14 +0000
Subject: [PATCH] CMake Minimum Version to 3.23

---
 .gitlab-ci.yml    |  8 ++++----
 CMakeLists.txt    |  2 +-
 cmake/Torch.cmake | 10 +---------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cbe0707..d82dbc79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -286,7 +286,7 @@ build:linux:arm64:bionic:unittests:
     - build:linux:arm64:bionic
 
 build:linux:arm64:focal:
-  image: nvcr.io/nvidia/l4t-pytorch:r35.1.0-pth1.13-py3
+  image: ${DORADO_DOCKER_ROOT}/dorado-l4t-pytorch-r35.1.0-pth1.13-py3:1.0
   variables:
     BUILD_OPTIONS: "-DONT_MM2_EXE=ON"
   extends:
@@ -429,7 +429,7 @@ build_archive:linux:arm64:bionic:
     - .on_nightly_or_manual
 
 build_archive:linux:arm64:focal:
-  image: nvcr.io/nvidia/l4t-pytorch:r35.1.0-pth1.13-py3
+  image: ${DORADO_DOCKER_ROOT}/dorado-l4t-pytorch-r35.1.0-pth1.13-py3:1.0
   extends:
     - .linux_dependencies
     - .linux_arm64_runner
@@ -546,7 +546,7 @@ test:linux:arm64:bionic:
     - build:linux:arm64:bionic
 
 test:linux:arm64:focal:
-  image: nvcr.io/nvidia/l4t-pytorch:r35.1.0-pth1.13-py3
+  image: ${DORADO_DOCKER_ROOT}/dorado-l4t-pytorch-r35.1.0-pth1.13-py3:1.0
   extends:
     - .linux_dependencies
     - .linux_orin_runner
@@ -615,7 +615,7 @@ test_archive:linux:arm64:18.04:
     - build_archive:linux:arm64:bionic
 
 test_archive:linux:arm64:20.04:
-  image: nvcr.io/nvidia/l4t-pytorch:r35.1.0-pth1.13-py3
+  image: ${DORADO_DOCKER_ROOT}/dorado-l4t-pytorch-r35.1.0-pth1.13-py3:1.0
   extends:
     - .linux_dependencies
     - .linux_orin_runner
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a88adef..1dfc31c3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.23)
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
diff --git a/cmake/Torch.cmake b/cmake/Torch.cmake
index 71be459e..8e5d16a4 100644
--- a/cmake/Torch.cmake
+++ b/cmake/Torch.cmake
@@ -283,14 +283,6 @@ if (USING_STATIC_TORCH_LIB)
         )
 
     elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # Older versions of cmake don't have the static_nocallback target for cuFFT that Torch needs, so we
-        # make it ourselves.
-        if (TARGET CUDA::cufft_static_nocallback)
-            set(ont_cufft_static_libs CUDA::cufft_static_nocallback)
-        else()
-            set(ont_cufft_static_libs ${CUDAToolkit_TARGET_DIR}/lib64/libcufft_static_nocallback.a)
-        endif()
-
         # Some CUDA lib symbols have internal linkage, so they must be part of the helper lib too
         set(ont_cuda_internal_linkage_libs CUDA::culibos CUDA::cudart_static)
         if (TARGET CUDA::cupti_static)
@@ -387,7 +379,7 @@ if (USING_STATIC_TORCH_LIB)
                 CUDA::cudart_static
                 CUDA::cublas_static
                 CUDA::cublasLt_static
-                ${ont_cufft_static_libs}
+                CUDA::cufft_static_nocallback
                 CUDA::cusolver_static
                 CUDA::cusparse_static
                 ${ont_cuda_internal_linkage_libs}