diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-07-20 19:26:42 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-21 23:35:38 +0200 |
| commit | 8eca221aac333489004953c4149011b5d74df176 (patch) | |
| tree | 6c46031c8b4f6f57a33661d43e5f4152029954c9 | |
| parent | 396e355c940d1427ccd7be7435499074f56bab7e (diff) | |
| download | meson-8eca221aac333489004953c4149011b5d74df176.zip meson-8eca221aac333489004953c4149011b5d74df176.tar.gz meson-8eca221aac333489004953c4149011b5d74df176.tar.bz2 | |
More tests and pic.
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 3 | ||||
| -rwxr-xr-x | run_project_tests.py | 1 | ||||
| -rw-r--r-- | test cases/cuda/2 split/lib.cu | 13 | ||||
| -rw-r--r-- | test cases/cuda/2 split/main.cpp | 7 | ||||
| -rw-r--r-- | test cases/cuda/2 split/meson.build | 7 | ||||
| -rw-r--r-- | test cases/cuda/2 split/static/lib.cu | 13 | ||||
| -rw-r--r-- | test cases/cuda/2 split/static/libsta.cu | 13 | ||||
| -rw-r--r-- | test cases/cuda/2 split/static/main_static.cpp | 7 | ||||
| -rw-r--r-- | test cases/cuda/2 split/static/meson.build | 4 |
9 files changed, 68 insertions, 0 deletions
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index a8cd7bc..7beecf9 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -188,3 +188,6 @@ __global__ void kernel (void) { def linker_to_compiler_args(self, args): return ['/link'] + args + + def get_pic_args(self): + return [] diff --git a/run_project_tests.py b/run_project_tests.py index 02897ce..4c6ca3b 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -542,6 +542,7 @@ def detect_tests_to_run(): ('objective c++', 'objcpp', backend not in (Backend.ninja, Backend.xcode) or mesonlib.is_windows() or not have_objcpp_compiler()), ('fortran', 'fortran', backend is not Backend.ninja or not shutil.which('gfortran')), ('swift', 'swift', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('swiftc')), + ('cuda', 'cuda', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('nvcc')), ('python3', 'python3', backend is not Backend.ninja), ('python', 'python', backend is not Backend.ninja), ('fpga', 'fpga', shutil.which('yosys') is None), diff --git a/test cases/cuda/2 split/lib.cu b/test cases/cuda/2 split/lib.cu new file mode 100644 index 0000000..c0471d0 --- /dev/null +++ b/test cases/cuda/2 split/lib.cu @@ -0,0 +1,13 @@ +#include <stdio.h> +#include <iostream> + +__global__ void kernel (void){ +} + +int do_cuda_stuff() { + kernel<<<1,1>>>(); + + printf("Hello, World!\n"); + return 0; +} + diff --git a/test cases/cuda/2 split/main.cpp b/test cases/cuda/2 split/main.cpp new file mode 100644 index 0000000..e5e6bda --- /dev/null +++ b/test cases/cuda/2 split/main.cpp @@ -0,0 +1,7 @@ +#include<iostream> + +int do_cuda_stuff(); + +int main(int argc, char **argv) { + return do_cuda_stuff(); +} diff --git a/test cases/cuda/2 split/meson.build b/test cases/cuda/2 split/meson.build new file mode 100644 index 0000000..51bf6ce --- /dev/null +++ b/test cases/cuda/2 split/meson.build @@ -0,0 +1,7 @@ +project('simple', 'cuda', 'cpp') + +exe = executable('prog', 'main.cpp', 'lib.cu') +test('cudatest', exe) + +subdir('static') + diff --git a/test cases/cuda/2 split/static/lib.cu b/test cases/cuda/2 split/static/lib.cu new file mode 100644 index 0000000..c0471d0 --- /dev/null +++ b/test cases/cuda/2 split/static/lib.cu @@ -0,0 +1,13 @@ +#include <stdio.h> +#include <iostream> + +__global__ void kernel (void){ +} + +int do_cuda_stuff() { + kernel<<<1,1>>>(); + + printf("Hello, World!\n"); + return 0; +} + diff --git a/test cases/cuda/2 split/static/libsta.cu b/test cases/cuda/2 split/static/libsta.cu new file mode 100644 index 0000000..c0471d0 --- /dev/null +++ b/test cases/cuda/2 split/static/libsta.cu @@ -0,0 +1,13 @@ +#include <stdio.h> +#include <iostream> + +__global__ void kernel (void){ +} + +int do_cuda_stuff() { + kernel<<<1,1>>>(); + + printf("Hello, World!\n"); + return 0; +} + diff --git a/test cases/cuda/2 split/static/main_static.cpp b/test cases/cuda/2 split/static/main_static.cpp new file mode 100644 index 0000000..e5e6bda --- /dev/null +++ b/test cases/cuda/2 split/static/main_static.cpp @@ -0,0 +1,7 @@ +#include<iostream> + +int do_cuda_stuff(); + +int main(int argc, char **argv) { + return do_cuda_stuff(); +} diff --git a/test cases/cuda/2 split/static/meson.build b/test cases/cuda/2 split/static/meson.build new file mode 100644 index 0000000..9078198 --- /dev/null +++ b/test cases/cuda/2 split/static/meson.build @@ -0,0 +1,4 @@ +l = static_library('clib', 'lib.cu') +exe = executable('staexe', 'main_static.cpp', + link_with : l) +test('static Cuda test', exe) |