From 2d187b07b6d3c0bc43abb0546a41d4ceaeda528d Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 15:46:50 +0900 Subject: [PATCH 1/7] ci docker: CUDA 11.8.0 --- .github/workflows/build-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index ca44a1e63..bf9bfb4a9 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -67,13 +67,13 @@ jobs: - tag: nvidia target: runtime-nvidia-env base_image: ubuntu:20.04 - base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04 + base_runtime_image: nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04 onnxruntime_version: 1.13.1 platforms: linux/amd64 - tag: nvidia-ubuntu20.04 target: runtime-nvidia-env base_image: ubuntu:20.04 - base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04 + base_runtime_image: nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04 onnxruntime_version: 1.13.1 platforms: linux/amd64 From 54d76c7e85a35c3ec9219bf4e54443d075dc808d Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 15:48:36 +0900 Subject: [PATCH 2/7] license: CUDA 11.8.0 (EULA no diff) --- generate_licenses.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/generate_licenses.py b/generate_licenses.py index da41db0c0..010a7b1c1 100644 --- a/generate_licenses.py +++ b/generate_licenses.py @@ -287,14 +287,14 @@ def generate_licenses() -> List[License]: ) # cuda - # license text from CUDA 11.6.2 - # https://developer.nvidia.com/cuda-11-6-2-download-archive?target_os=Windows&target_arch=x86_64&target_version=10&target_type=exe_local # noqa: B950 - # https://developer.download.nvidia.com/compute/cuda/11.6.2/local_installers/cuda_11.6.2_511.65_windows.exe # noqa: B950 - # cuda_11.6.2_511.65_windows.exe (cuda_documentation/Doc/EULA.txt) + # license text from CUDA 11.8.0 + # https://developer.nvidia.com/cuda-11-8-0-download-archive?target_os=Windows&target_arch=x86_64&target_version=10&target_type=exe_local # noqa: B950 + # https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_522.06_windows.exe # noqa: B950 + # cuda_11.8.0_522.06_windows.exe (cuda_documentation/Doc/EULA.txt) licenses.append( License( name="CUDA Toolkit", - version="11.6.2", + version="11.8.0", license=None, text=Path("docs/licenses/cuda/EULA.txt").read_text(encoding="utf8"), ) From c42eb3e783af4a8932b6118222e25566d5d57cd3 Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 15:49:42 +0900 Subject: [PATCH 3/7] Makefile docker: CUDA 11.8.0 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f2c33cc10..f09bfcafe 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ build-linux-docker-nvidia-ubuntu20.04: --target runtime-nvidia-env \ --progress plain \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg BASE_RUNTIME_IMAGE=nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04 \ + --build-arg BASE_RUNTIME_IMAGE=nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04 \ --build-arg ONNXRUNTIME_URL=https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz \ --build-arg VOICEVOX_CORE_LIBRARY_NAME=libcore_gpu_x64_nvidia.so $(ARGS) @@ -68,7 +68,7 @@ build-linux-docker-nvidia-ubuntu18.04: --target runtime-nvidia-env \ --progress plain \ --build-arg BASE_IMAGE=ubuntu:18.04 \ - --build-arg BASE_RUNTIME_IMAGE=nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu18.04 \ + --build-arg BASE_RUNTIME_IMAGE=nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu18.04 \ --build-arg ONNXRUNTIME_URL=https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz \ --build-arg VOICEVOX_CORE_LIBRARY_NAME=libcore_gpu_x64_nvidia.so $(ARGS) From b1c16adc9a0c860f36e6fa04731d3a7cfb2e066d Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 15:50:38 +0900 Subject: [PATCH 4/7] ci binary: CUDA 11.8.0 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 658222bc6..47a879069 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: architecture: "x64" voicevox_core_asset_prefix: voicevox_core-windows-x64-cuda onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-win-x64-gpu-1.13.1.zip - cuda_version: "11.6.2" + cuda_version: "11.8.0" cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.4.1/local_installers/11.6/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip zlib_url: http://www.winimage.com/zLibDll/zlib123dllx64.zip target: windows-nvidia @@ -89,7 +89,7 @@ jobs: architecture: "x64" voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz - cuda_version: "11.6.2" + cuda_version: "11.8.0" cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.4.1/local_installers/11.6/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz target: linux-nvidia From 528949ccc39089c754e2b4bd9f4f728e4af60334 Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 15:54:39 +0900 Subject: [PATCH 5/7] license: cuDNN 8.9.2 (LICENSE updated) --- docs/licenses/cudnn/LICENSE | 22 ++++++++++++++++++---- generate_licenses.py | 8 ++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/docs/licenses/cudnn/LICENSE b/docs/licenses/cudnn/LICENSE index 2fa778e2a..1aafb2b5e 100644 --- a/docs/licenses/cudnn/LICENSE +++ b/docs/licenses/cudnn/LICENSE @@ -176,17 +176,31 @@ Reproduction of information in this document is permissible only if approved in THIS DOCUMENT AND ALL NVIDIA DESIGN SPECIFICATIONS, REFERENCE BOARDS, FILES, DRAWINGS, DIAGNOSTICS, LISTS, AND OTHER DOCUMENTS (TOGETHER AND SEPARATELY, “MATERIALS”) ARE BEING PROVIDED “AS IS.” NVIDIA MAKES NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL NVIDIA BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF ANY USE OF THIS DOCUMENT, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. Notwithstanding any damages that customer might incur for any reason whatsoever, NVIDIA’s aggregate and cumulative liability towards customer for the products described herein shall be limited in accordance with the Terms of Sale for the product. -ARM +Arm -ARM, AMBA and ARM Powered are registered trademarks of ARM Limited. Cortex, MPCore and Mali are trademarks of ARM Limited. "ARM" is used to represent ARM Holdings plc; its operating company ARM Limited; and the regional subsidiaries ARM Inc.; ARM KK; ARM Korea Limited.; ARM Taiwan Limited; ARM France SAS; ARM Consulting (Shanghai) Co. Ltd.; ARM Germany GmbH; ARM Embedded Technologies Pvt. Ltd.; ARM Norway, AS and ARM Sweden AB. +Arm, AMBA and Arm Powered are registered trademarks of Arm Limited. Cortex, MPCore and Mali are trademarks of Arm Limited. "Arm" is used to represent Arm Holdings plc; its operating company Arm Limited; and the regional subsidiaries Arm Inc.; Arm KK; Arm Korea Limited.; Arm Taiwan Limited; Arm France SAS; Arm Consulting (Shanghai) Co. Ltd.; Arm Germany GmbH; Arm Embedded Technologies Pvt. Ltd.; Arm Norway, AS and Arm Sweden AB. + +HDMI + +HDMI, the HDMI logo, and High-Definition Multimedia Interface are trademarks or registered trademarks of HDMI Licensing LLC. + +Blackberry/QNX + +Copyright © 2020 BlackBerry Limited. All rights reserved. + +Trademarks, including but not limited to BLACKBERRY, EMBLEM Design, QNX, AVIAGE, MOMENTICS, NEUTRINO and QNX CAR are the trademarks or registered trademarks of BlackBerry Limited, used under license, and the exclusive rights to such trademarks are expressly reserved. + +Google + +Android, Android TV, Google Play and the Google Play logo are trademarks of Google, Inc. Trademarks -NVIDIA, the NVIDIA logo, and CUDA, DRIVE, JetPack, Kepler, Maxwell, Pascal, Turing, Volta and Xavier are trademarks and/or registered trademarks of NVIDIA Corporation in the United States and other countries. Other company and product names may be trademarks of the respective companies with which they are associated. +NVIDIA, the NVIDIA logo, and BlueField, CUDA, DALI, DRIVE, Hopper, JetPack, Jetson AGX Xavier, Jetson Nano, Maxwell, NGC, Nsight, Orin, Pascal, Quadro, Tegra, TensorRT, Triton, Turing and Volta are trademarks and/or registered trademarks of NVIDIA Corporation in the United States and other countries. Other company and product names may be trademarks of the respective companies with which they are associated. Copyright -© 2017-2022 NVIDIA Corporation & affiliates. All rights reserved. +© 2014-2023 NVIDIA Corporation & affiliates. All rights reserved. NVIDIA Corporation | 2788 San Tomas Expressway, Santa Clara, CA 95051 diff --git a/generate_licenses.py b/generate_licenses.py index 010a7b1c1..7e5c0285a 100644 --- a/generate_licenses.py +++ b/generate_licenses.py @@ -301,14 +301,14 @@ def generate_licenses() -> List[License]: ) # cudnn # license text from - # cuDNN v8.4.1 (May 27th, 2022), for CUDA 11.x, cuDNN Library for Windows + # cuDNN v8.9.2 (June 1st, 2023), for CUDA 11.x, cuDNN Library for Windows # https://developer.nvidia.com/rdp/cudnn-archive # noqa: B950 - # https://developer.download.nvidia.com/compute/redist/cudnn/v8.4.1/local_installers/11.6/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip # noqa: B950 - # cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip (cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/LICENSE) # noqa: B950 + # https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.2.26_cuda11-archive.zip # noqa: B950 + # cudnn-windows-x86_64-8.9.2.26_cuda11-archive.zip (cudnn-windows-x86_64-8.9.2.26_cuda11-archive/LICENSE) # noqa: B950 licenses.append( License( name="cuDNN", - version="8.4.1", + version="8.9.2", license=None, text=Path("docs/licenses/cudnn/LICENSE").read_text(encoding="utf8"), ) From 49ffe9cfe333e50ad8e1bc5a3ffc95f2fc34a4f6 Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 16:26:41 +0900 Subject: [PATCH 6/7] ci binary: cuDNN 8.9.2 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47a879069..2e442b55f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: voicevox_core_asset_prefix: voicevox_core-windows-x64-cuda onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-win-x64-gpu-1.13.1.zip cuda_version: "11.8.0" - cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.4.1/local_installers/11.6/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip + cudnn_url: https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.2.26_cuda11-archive.zip zlib_url: http://www.winimage.com/zLibDll/zlib123dllx64.zip target: windows-nvidia # Mac CPU (x64 arch only) @@ -90,7 +90,7 @@ jobs: voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz cuda_version: "11.8.0" - cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.4.1/local_installers/11.6/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz + cudnn_url: https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.2.26_cuda11-archive.tar.xz target: linux-nvidia runs-on: ${{ matrix.os }} From 7bff6e314c127c565fd8d3b56ab415eafe160d5d Mon Sep 17 00:00:00 2001 From: aoirint Date: Sat, 17 Jun 2023 16:37:51 +0900 Subject: [PATCH 7/7] binary ci: update Jimver/cuda-toolkit to v0.2.10 (CUDA 11.8 added) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e442b55f..55afb67f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,7 +134,7 @@ jobs: - name: Setup CUDA if: matrix.cuda_version != '' && steps.cuda-dll-cache.outputs.cache-hit != 'true' - uses: Jimver/cuda-toolkit@v0.2.8 + uses: Jimver/cuda-toolkit@6974ecc945579a89135a1e1d9eac96ec361a1171 # v0.2.10 id: cuda-toolkit with: method: network