From 210907a7227035f1be00d08c9d749875035d8a67 Mon Sep 17 00:00:00 2001 From: Ronan Desplanques Date: Mon, 20 Feb 2023 13:54:45 +0100 Subject: [PATCH] Rename sample directory Starting with version 11.6, CUDA does not come with samples in the distribution anymore. The recommended source for samples is now https://github.com/nvidia/cuda-samples. In the newly recommended repository, the directory hierarchy is different from the one that came with CUDA. The renaming that this patch performs makes GNAT for CUDA samples mirror the CUDA samples from https://github.com/nvidia/cuda-samples. --- README.md | 6 +++--- doc/installation.rst | 2 +- .../{0_Simple => 0_Introduction}/simpleStreams/Makefile | 0 .../{0_Simple => 0_Introduction}/simpleStreams/device.gpr | 0 .../{0_Simple => 0_Introduction}/simpleStreams/host.gpr | 0 .../simpleStreams/src/common/kernels.adb | 0 .../simpleStreams/src/common/kernels.ads | 0 .../simpleStreams/src/common/support.ads | 0 .../simpleStreams/src/host/main.adb | 0 examples/{0_Simple => 0_Introduction}/vectorAdd/Makefile | 0 examples/{0_Simple => 0_Introduction}/vectorAdd/device.gpr | 0 examples/{0_Simple => 0_Introduction}/vectorAdd/host.gpr | 0 .../vectorAdd/src/common/kernel.adb | 0 .../vectorAdd/src/common/kernel.ads | 0 .../vectorAdd/src/host/main.adb | 0 testsuite/tests/examples/vectorAdd/test.yaml | 2 +- 16 files changed, 5 insertions(+), 5 deletions(-) rename examples/{0_Simple => 0_Introduction}/simpleStreams/Makefile (100%) rename examples/{0_Simple => 0_Introduction}/simpleStreams/device.gpr (100%) rename examples/{0_Simple => 0_Introduction}/simpleStreams/host.gpr (100%) rename examples/{0_Simple => 0_Introduction}/simpleStreams/src/common/kernels.adb (100%) rename examples/{0_Simple => 0_Introduction}/simpleStreams/src/common/kernels.ads (100%) rename examples/{0_Simple => 0_Introduction}/simpleStreams/src/common/support.ads (100%) rename examples/{0_Simple => 0_Introduction}/simpleStreams/src/host/main.adb (100%) rename examples/{0_Simple => 0_Introduction}/vectorAdd/Makefile (100%) rename examples/{0_Simple => 0_Introduction}/vectorAdd/device.gpr (100%) rename examples/{0_Simple => 0_Introduction}/vectorAdd/host.gpr (100%) rename examples/{0_Simple => 0_Introduction}/vectorAdd/src/common/kernel.adb (100%) rename examples/{0_Simple => 0_Introduction}/vectorAdd/src/common/kernel.ads (100%) rename examples/{0_Simple => 0_Introduction}/vectorAdd/src/host/main.adb (100%) diff --git a/README.md b/README.md index 2b56df7..dab6535 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ make **Note**: By default we are building for `x86_64,` Turing family GPU `sm_75` - First [Setup GNAT for CUDA](#setup-gnat-for-cuda). Then: ``` -cd examples/0_Simple/vectorAdd +cd examples/0_Introduction/vectorAdd make ``` @@ -110,7 +110,7 @@ CUDA_HOST=aarch64-linux - Build example program. On **host**: ``` source ./env.sh -cd examples/0_Simple/vectorAdd +cd examples/0_Introduction/vectorAdd make ``` @@ -123,4 +123,4 @@ scp main alice@192.168.x.y:~ ``` ssh alice@192.168.x.y:~ ./main -``` \ No newline at end of file +``` diff --git a/doc/installation.rst b/doc/installation.rst index ced9497..a0256db 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -61,7 +61,7 @@ To check if everything is correctly installed, you can try an example: .. code-block:: shell - cd cuda/examples/0_Simple/vectorAdd + cd cuda/examples/0_Introduction/vectorAdd make ./main diff --git a/examples/0_Simple/simpleStreams/Makefile b/examples/0_Introduction/simpleStreams/Makefile similarity index 100% rename from examples/0_Simple/simpleStreams/Makefile rename to examples/0_Introduction/simpleStreams/Makefile diff --git a/examples/0_Simple/simpleStreams/device.gpr b/examples/0_Introduction/simpleStreams/device.gpr similarity index 100% rename from examples/0_Simple/simpleStreams/device.gpr rename to examples/0_Introduction/simpleStreams/device.gpr diff --git a/examples/0_Simple/simpleStreams/host.gpr b/examples/0_Introduction/simpleStreams/host.gpr similarity index 100% rename from examples/0_Simple/simpleStreams/host.gpr rename to examples/0_Introduction/simpleStreams/host.gpr diff --git a/examples/0_Simple/simpleStreams/src/common/kernels.adb b/examples/0_Introduction/simpleStreams/src/common/kernels.adb similarity index 100% rename from examples/0_Simple/simpleStreams/src/common/kernels.adb rename to examples/0_Introduction/simpleStreams/src/common/kernels.adb diff --git a/examples/0_Simple/simpleStreams/src/common/kernels.ads b/examples/0_Introduction/simpleStreams/src/common/kernels.ads similarity index 100% rename from examples/0_Simple/simpleStreams/src/common/kernels.ads rename to examples/0_Introduction/simpleStreams/src/common/kernels.ads diff --git a/examples/0_Simple/simpleStreams/src/common/support.ads b/examples/0_Introduction/simpleStreams/src/common/support.ads similarity index 100% rename from examples/0_Simple/simpleStreams/src/common/support.ads rename to examples/0_Introduction/simpleStreams/src/common/support.ads diff --git a/examples/0_Simple/simpleStreams/src/host/main.adb b/examples/0_Introduction/simpleStreams/src/host/main.adb similarity index 100% rename from examples/0_Simple/simpleStreams/src/host/main.adb rename to examples/0_Introduction/simpleStreams/src/host/main.adb diff --git a/examples/0_Simple/vectorAdd/Makefile b/examples/0_Introduction/vectorAdd/Makefile similarity index 100% rename from examples/0_Simple/vectorAdd/Makefile rename to examples/0_Introduction/vectorAdd/Makefile diff --git a/examples/0_Simple/vectorAdd/device.gpr b/examples/0_Introduction/vectorAdd/device.gpr similarity index 100% rename from examples/0_Simple/vectorAdd/device.gpr rename to examples/0_Introduction/vectorAdd/device.gpr diff --git a/examples/0_Simple/vectorAdd/host.gpr b/examples/0_Introduction/vectorAdd/host.gpr similarity index 100% rename from examples/0_Simple/vectorAdd/host.gpr rename to examples/0_Introduction/vectorAdd/host.gpr diff --git a/examples/0_Simple/vectorAdd/src/common/kernel.adb b/examples/0_Introduction/vectorAdd/src/common/kernel.adb similarity index 100% rename from examples/0_Simple/vectorAdd/src/common/kernel.adb rename to examples/0_Introduction/vectorAdd/src/common/kernel.adb diff --git a/examples/0_Simple/vectorAdd/src/common/kernel.ads b/examples/0_Introduction/vectorAdd/src/common/kernel.ads similarity index 100% rename from examples/0_Simple/vectorAdd/src/common/kernel.ads rename to examples/0_Introduction/vectorAdd/src/common/kernel.ads diff --git a/examples/0_Simple/vectorAdd/src/host/main.adb b/examples/0_Introduction/vectorAdd/src/host/main.adb similarity index 100% rename from examples/0_Simple/vectorAdd/src/host/main.adb rename to examples/0_Introduction/vectorAdd/src/host/main.adb diff --git a/testsuite/tests/examples/vectorAdd/test.yaml b/testsuite/tests/examples/vectorAdd/test.yaml index 927f1f4..38d915d 100644 --- a/testsuite/tests/examples/vectorAdd/test.yaml +++ b/testsuite/tests/examples/vectorAdd/test.yaml @@ -1,2 +1,2 @@ driver: examples -input_directory: "0_Simple/vectorAdd" +input_directory: "0_Introduction/vectorAdd"