From 243671eece9c9e3d38b7cecf404acd4ea4bd2f05 Mon Sep 17 00:00:00 2001
From: Masahiro Wada <argon.argon.argon@gmail.com>
Date: Thu, 28 Sep 2023 04:17:31 +0900
Subject: Enhancements in CUDA Support (#699)

* add cuda tookit installing support

* add nvcc installing support

* add libcudnn8-dev installing support

* add new cuda versions adn cudnn versions

* add specificaitons of new option

* remove installNvcc

installNvcc process is included in installToolkit

* add tests for new nvidia-cuda options

* fix wrong scenario name

* Revert "add specificaitons of new option"

This reverts commit 0dcdb92406e38caa297643eab5af641f814b4f69.

README.md should be generated by CI workflow.

* make cudnn-dev installation isolated

* dump minor version to 1.1.0
---
 test/nvidia-cuda/install_all_options.sh | 21 +++++++++++++++++++++
 test/nvidia-cuda/install_cudnn_nvxt.sh  | 15 ---------------
 test/nvidia-cuda/scenarios.json         |  8 +++++---
 3 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 test/nvidia-cuda/install_all_options.sh
 delete mode 100644 test/nvidia-cuda/install_cudnn_nvxt.sh

(limited to 'test')

diff --git a/test/nvidia-cuda/install_all_options.sh b/test/nvidia-cuda/install_all_options.sh
new file mode 100644
index 0000000..7d9e031
--- /dev/null
+++ b/test/nvidia-cuda/install_all_options.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn8
+check "libcudnn.so.8" test 1 -eq "$(find /usr -name 'libcudnn.so.8' | wc -l)"
+
+# Check installation of libcudnn8-dev
+check "cudnn.h" test 1 -eq "$(find /usr -name 'cudnn.h' | wc -l)"
+
+# Check installation of cuda-nvtx-11-<version>
+check "cuda-11+nvtx" test -e '/usr/local/cuda-11/targets/x86_64-linux/include/nvtx3'
+
+# Check installation of cuda-nvcc-11-<version>
+check "cuda-11+nvcc" test -e '/usr/local/cuda-11/bin/nvcc'
+
+# Report result
+reportResults
diff --git a/test/nvidia-cuda/install_cudnn_nvxt.sh b/test/nvidia-cuda/install_cudnn_nvxt.sh
deleted file mode 100644
index 7b20f43..0000000
--- a/test/nvidia-cuda/install_cudnn_nvxt.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Check installation of libcudnn8
-check "libcudnn.so.8" test 1 -eq "$(find /usr -name 'libcudnn.so.8' | wc -l)"
-
-# Check installation of cuda-nvtx-11-<version>
-check "cuda-11+nvtx" test -e '/usr/local/cuda-11/targets/x86_64-linux/include/nvtx3'
-
-# Report result
-reportResults
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
index 1993dcd..3018330 100644
--- a/test/nvidia-cuda/scenarios.json
+++ b/test/nvidia-cuda/scenarios.json
@@ -1,10 +1,12 @@
 {
-    "install_cudnn_nvxt": {
+    "install_all_options": {
         "image": "debian",
         "features": {
             "nvidia-cuda": {
                 "installCudnn": true,
-                "installNvtx": true
+                "installCudnnDev": true,
+                "installNvtx": true,
+                "installToolkit": true
             }
         }
     },
@@ -19,4 +21,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3