pytorch
diff --git a/‎caffe2/CMakeLists.txt
Copy file name to clipboardExpand all lines: caffe2/CMakeLists.txt
-5Lines changed: 0 additions & 5 deletions b/‎caffe2/CMakeLists.txt
Copy file name to clipboardExpand all lines: caffe2/CMakeLists.txt
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎cmake/public/cuda.cmake
Copy file name to clipboardExpand all lines: cmake/public/cuda.cmake
+12-4Lines changed: 12 additions & 4 deletions b/‎cmake/public/cuda.cmake
Copy file name to clipboardExpand all lines: cmake/public/cuda.cmake
+12-4Lines changed: 12 additions & 4 deletions
@@ -1083,11 +1083,6 @@ elseif(USE_CUDA)
           CUDA::cusolver
       )
     endif()
-    # NS: TODO, is this really necessary?
-    if(USE_MAGMA AND CAFFE2_STATIC_LINK_CUDA)
-      target_link_libraries(torch_cuda_linalg PRIVATE
-          CUDA::culibos ${CMAKE_DL_LIBS})
-    endif()
     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/../aten/src/ATen/native/cuda/LinearAlgebraStubs.cpp PROPERTIES COMPILE_FLAGS "-DBUILD_LAZY_CUDA_LINALG")
     install(TARGETS torch_cuda_linalg DESTINATION "${TORCH_INSTALL_LIB_DIR}")
   endif()
 
@@ -56,17 +56,25 @@ endif()
 find_package(CUDAToolkit REQUIRED)
 
 cmake_policy(POP)
+if(NOT CUDAToolkit_FOUND)
+  message(WARNING
+    "PyTorch: CUDA cannot be found. Depending on whether you are building "
+    "PyTorch or a PyTorch dependent library, the next warning / error will "
+    "give you more info.")
+  set(CAFFE2_USE_CUDA OFF)
+  return()
+endif()
 
 if(NOT CMAKE_CUDA_COMPILER_VERSION VERSION_EQUAL CUDAToolkit_VERSION)
   message(FATAL_ERROR "Found two conflicting CUDA versions:\n"
                       "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n"
                       "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIRS}'")
 endif()
 
-message(STATUS "PyTorch: CUDA detected: " ${CUDA_VERSION})
-message(STATUS "PyTorch: CUDA nvcc is: " ${CUDA_NVCC_EXECUTABLE})
-message(STATUS "PyTorch: CUDA toolkit directory: " ${CUDA_TOOLKIT_ROOT_DIR})
-if(CUDA_VERSION VERSION_LESS 11.0)
+message(STATUS "PyTorch: CUDA detected: " ${CUDAToolkit_VERSION})
+message(STATUS "PyTorch: CUDA nvcc is: " ${CUDAToolkit_NVCC_EXECUTABLE})
+message(STATUS "PyTorch: CUDA toolkit directory: " ${CUDAToolkit_ROOT})
+if(CUDAToolkit_VERSION VERSION_LESS 11.0)
   message(FATAL_ERROR "PyTorch requires CUDA 11.0 or above.")
 endif()