Upgrade to libtorch v1.10.1 (#93)

* Upgrade to libtorch v1.10.1.

* Add option to download libtorch 1.10.1 for CUDA 11.1.

Author: mfl28

CMakeLists.txt

@@ -7,7 +7,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 option(DOWNLOAD_DATASETS "Automatically download required datasets at build-time." ON)
 option(CREATE_SCRIPTMODULES "Automatically create all required scriptmodule files at build-time (requires python3)." OFF)
 
-set(PYTORCH_VERSION "1.9.0")
+set(PYTORCH_VERSION "1.10.1")
 
 find_package(Torch ${PYTORCH_VERSION} EXACT QUIET PATHS "${CMAKE_SOURCE_DIR}/libtorch")
 

Dockerfile

@@ -31,8 +31,8 @@ RUN curl --silent --show-error --location --output ~/miniconda.sh https://repo.a
 
 FROM conda AS conda-installs
 # Install pytorch for CPU and torchvision.
-ARG PYTORCH_VERSION=1.9.0
-ARG TORCHVISION_VERSION=0.10.0
+ARG PYTORCH_VERSION=1.10.1
+ARG TORCHVISION_VERSION=0.11.2
 ENV NO_CUDA=1
 RUN conda install pytorch==${PYTORCH_VERSION} torchvision==${TORCHVISION_VERSION} cpuonly -y -c pytorch && conda clean -ya
 

README.md

@@ -5,12 +5,12 @@
     C++ Implementation of PyTorch Tutorials for Everyone
     <br />
 <img src="https://img.shields.io/github/license/prabhuomkar/pytorch-cpp">
-<img src="https://img.shields.io/badge/libtorch-1.9.0-ee4c2c">
+<img src="https://img.shields.io/badge/libtorch-1.10.1-ee4c2c">
 <img src="https://img.shields.io/badge/cmake-3.14-064f8d">
 </p>
 
 
-| OS (Compiler)\\LibTorch |                                                  1.9.0                                                |
+| OS (Compiler)\\LibTorch |                                                  1.10.1                                                |
 | :--------------------- | :--------------------------------------------------------------------------------------------------- |
 |    macOS (clang 10.0, 11.0, 12.0)    | [![Status](https://github.com/prabhuomkar/pytorch-cpp/actions/workflows/build_macos.yml/badge.svg?branch=master)](https://github.com/prabhuomkar/pytorch-cpp/actions?query=workflow%3Aci-build-macos) |
 |      Linux (gcc 8, 9, 10, 11)      | [![Status](https://github.com/prabhuomkar/pytorch-cpp/actions/workflows/build_ubuntu.yml/badge.svg?branch=master)](https://github.com/prabhuomkar/pytorch-cpp/actions?query=workflow%3Aci-build-ubuntu) |
@@ -52,7 +52,7 @@ This repository provides tutorial code in C++ for deep learning researchers to l
 
 1. [C++-17](http://www.cplusplus.com/doc/tutorial/introduction/) compatible compiler
 2. [CMake](https://cmake.org/download/) (minimum version 3.14)
-3. [LibTorch v1.9.0](https://pytorch.org/cppdocs/installing.html)
+3. [LibTorch v1.10.1](https://pytorch.org/cppdocs/installing.html)
 4. [Conda](https://docs.conda.io/projects/conda/en/latest/user-guide/install/download.html)
 
 
@@ -89,11 +89,12 @@ Some useful options:
 
 | Option       | Default           | Description  |
 | :------------- |:------------|-----:|
-| `-D CUDA_V=(\|10.2\|11.1\|none)`     | `none` | Download LibTorch for a CUDA version (`none` = download CPU version). |
+| `-D CUDA_V=(10.2\|11.1\|11.3\|none)`     | `none` | Download LibTorch for a CUDA version (`none` = download CPU version). |
+| `-D LIBTORCH_DOWNLOAD_BUILD_TYPE=(Release\|Debug)` | `Release` | Determines which libtorch build type version to download (only relevant on **Windows**).|
 | `-D DOWNLOAD_DATASETS=(OFF\|ON)`     | `ON`      |   Download required datasets during build (only if they do not already exist in `pytorch-cpp/data`). |
 |`-D CREATE_SCRIPTMODULES=(OFF\|ON)` | `OFF` | Create all required scriptmodule files for prelearned models / weights during build. Requires installed  python3 with  pytorch and torchvision. |
 | `-D CMAKE_PREFIX_PATH=path/to/libtorch/share/cmake/Torch` |   `<empty>`    |    Skip the downloading of LibTorch and use your own local version (see [Requirements](#requirements)) instead. |
-| `-D CMAKE_BUILD_TYPE=(Release\|Debug)` | `<empty>` (`Release` when downloading LibTorch on Windows) | Set the build type (`Release` = compile with optimizations).|
+| `-D CMAKE_BUILD_TYPE=(Release\|Debug\|...)` | `<empty>` | Determines the CMake build-type for single-configuration generators (see [CMake docs](https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html)).|
 
 <details>
 <summary><b>Example Linux</b></summary>
@@ -115,14 +116,14 @@ cmake -B build \
 <summary><b>Example Windows</b></summary>
 
 ##### Aim
-* Automatically download LibTorch for CUDA 11.1 and all necessary datasets.
+* Automatically download LibTorch for CUDA 11.3 (Release version) and all necessary datasets.
 * Do not create scriptmodule files.
 
 ##### Command
 ```bash
 cmake -B build \
 -A x64 \
--D CUDA_V=11.1
+-D CUDA_V=11.3
 ```
 </details>
 

cmake/fetch_libtorch.cmake

@@ -2,27 +2,34 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 include(FetchContent)
 
-set(CUDA_V "none" CACHE STRING "Determines libtorch CUDA version to download (10.2, 11.1 or none).")
+set(CUDA_V "none" CACHE STRING "Determines libtorch CUDA version to download (10.2, 11.1, 11.3 or none).")
 
 if(${CUDA_V} STREQUAL "none")
     set(LIBTORCH_DEVICE "cpu")
 elseif(${CUDA_V} STREQUAL "10.2")
     set(LIBTORCH_DEVICE "cu102")
 elseif(${CUDA_V} STREQUAL "11.1")
     set(LIBTORCH_DEVICE "cu111")
+elseif(${CUDA_V} STREQUAL "11.3")
+    set(LIBTORCH_DEVICE "cu113")
 else() 
-    message(FATAL_ERROR "Invalid CUDA version specified, must be 10.2, 11.1 or none!")
-endif()
-
-if(NOT ${LIBTORCH_DEVICE} STREQUAL "cu102")
-    set(LIBTORCH_DEVICE_TAG "%2B${LIBTORCH_DEVICE}")
+    message(FATAL_ERROR "Invalid CUDA version specified, must be 10.2, 11.1, 11.3 or none!")
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    set(LIBTORCH_URL "https://download.pytorch.org/libtorch/${LIBTORCH_DEVICE}/libtorch-win-shared-with-deps-${PYTORCH_VERSION}${LIBTORCH_DEVICE_TAG}.zip")
-    set(CMAKE_BUILD_TYPE "Release")
+    set(LIBTORCH_DOWNLOAD_BUILD_TYPE "Release" CACHE STRING "Determines whether to download Release (default) or Debug libtorch version.")
+
+    if(${LIBTORCH_DOWNLOAD_BUILD_TYPE} STREQUAL "Debug")
+        set(LIBTORCH_DOWNLOAD_BUILD_TYPE_TAG "debug-")
+    elseif(${LIBTORCH_DOWNLOAD_BUILD_TYPE} STREQUAL "Release")
+        set(LIBTORCH_DOWNLOAD_BUILD_TYPE_TAG "")
+    else()
+        message(FATAL_ERROR "Invalid libtorch build type, must be either Release or Debug.")
+    endif()
+
+    set(LIBTORCH_URL "https://download.pytorch.org/libtorch/${LIBTORCH_DEVICE}/libtorch-win-shared-with-deps-${LIBTORCH_DOWNLOAD_BUILD_TYPE_TAG}${PYTORCH_VERSION}%2B${LIBTORCH_DEVICE}.zip")
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    set(LIBTORCH_URL "https://download.pytorch.org/libtorch/${LIBTORCH_DEVICE}/libtorch-shared-with-deps-${PYTORCH_VERSION}${LIBTORCH_DEVICE_TAG}.zip")
+    set(LIBTORCH_URL "https://download.pytorch.org/libtorch/${LIBTORCH_DEVICE}/libtorch-shared-with-deps-${PYTORCH_VERSION}%2B${LIBTORCH_DEVICE}.zip")
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
     if(NOT ${LIBTORCH_DEVICE} STREQUAL "cpu")
         message(WARNING "MacOS binaries do not support CUDA, will download CPU version instead.")