Merge pull request #6380 from scivision/cuda_qc

refactor/doc: cuda tests

docs/markdown/Contributing.md

@@ -127,6 +127,17 @@ project tests. To run all tests, execute `./run_tests.py`. Unit tests
 can be run with `./run_unittests.py` and project tests with
 `./run_project_tests.py`.
 
+Subsets of project tests can be selected with
+`./run_project_tests.py --only` option. This can save a great deal of
+time when only a certain part of Meson is being tested.
+For example, a useful and easy contribution to Meson is making
+sure the full set of compilers is supported. One could for example test
+various Fortran compilers by setting `FC=ifort` or `FC=flang` or similar
+with `./run_project_test.py --only fortran`.
+Some families of tests require a particular backend to run.
+For example, all the CUDA project tests run and pass on Windows via
+`./run_project_tests.py --only cuda --backend ninja`
+
 Each project test is a standalone project that can be compiled on its
 own. They are all in `test cases` subdirectory. The simplest way to
 run a single project test is to do something like `./meson.py test\
@@ -225,8 +236,6 @@ those are simple.
 - indent 4 spaces, no tabs ever
 - brace always on the same line as if/for/else/function definition
 
-
-
 ## External dependencies
 
 The goal of Meson is to be as easily usable as possible. The user

run_project_tests.py

@@ -581,7 +581,7 @@ def skippable(suite, test):
     # Other framework tests are allowed to be skipped on other platforms
     return True
 
-def skip_csharp(backend):
+def skip_csharp(backend) -> bool:
     if backend is not Backend.ninja:
         return True
     if not shutil.which('resgen'):
@@ -671,6 +671,7 @@ def detect_tests_to_run(only: typing.List[str]) -> typing.List[typing.Tuple[str,
         ('objective c++', 'objcpp', backend not in (Backend.ninja, Backend.xcode) or not have_objcpp_compiler()),
         ('fortran', 'fortran', skip_fortran or backend != Backend.ninja),
         ('swift', 'swift', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('swiftc')),
+        # CUDA tests on Windows: use Ninja backend:  python run_project_tests.py --only cuda --backend ninja
         ('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),

test cases/cuda/1 simple/prog.cu

@@ -1,6 +1,6 @@
 #include <iostream>
 
-int main(int argc, char **argv) {
+int main(void) {
     int cuda_devices = 0;
     std::cout << "CUDA version: " << CUDART_VERSION << "\n";
     cudaGetDeviceCount(&cuda_devices);

test cases/cuda/10 cuda dependency/c/prog.c

@@ -1,7 +1,7 @@
 #include <cuda_runtime.h>
 #include <stdio.h>
 
-int cuda_devices() {
+int cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;

test cases/cuda/11 cuda dependency (nvcc)/modules/prog.cu

@@ -2,13 +2,13 @@
 #include <cublas_v2.h>
 #include <iostream>
 
-int cuda_devices() {
+int cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;
 }
 
-int main() {
+int main(void) {
     int n = cuda_devices();
     if (n == 0) {
         std::cout << "No CUDA hardware found. Exiting.\n";

test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu

@@ -1,13 +1,13 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
-int cuda_devices() {
+int cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;
 }
 
-int main() {
+int main(void) {
     std::cout << "Compiled against CUDA version: " << CUDART_VERSION << "\n";
     int runtime_version = 0;
     cudaError_t r = cudaRuntimeGetVersion(&runtime_version);

test cases/cuda/12 cuda dependency (mixed)/kernel.cu

@@ -3,6 +3,6 @@
 __global__ void kernel (void){
 }
 
-void do_cuda_stuff() {
+void do_cuda_stuff(void) {
   kernel<<<1,1>>>();
 }

test cases/cuda/12 cuda dependency (mixed)/prog.cpp

@@ -2,7 +2,7 @@
 #include <cublas_v2.h>
 #include <iostream>
 
-void do_cuda_stuff();
+void do_cuda_stuff(void);
 
 int cuda_devices(void) {
     int result = 0;

test cases/cuda/2 split/lib.cu

@@ -4,7 +4,7 @@
 __global__ void kernel (void){
 }
 
-int do_cuda_stuff() {
+int do_cuda_stuff(void) {
   kernel<<<1,1>>>();
 
   printf("Hello, World!\n");

test cases/cuda/2 split/main.cpp

@@ -1,7 +1,7 @@
 #include<iostream>
 
-int do_cuda_stuff();
+int do_cuda_stuff(void);
 
-int main(int argc, char **argv) {
+int main(void) {
   return do_cuda_stuff();
 }

test cases/cuda/2 split/static/main_static.cpp

@@ -1,7 +1,7 @@
 #include<iostream>
 
-int do_cuda_stuff();
+int do_cuda_stuff(void);
 
-int main(int argc, char **argv) {
+int main(void) {
   return do_cuda_stuff();
 }

test cases/cuda/3 cudamodule/prog.cu

@@ -1,6 +1,6 @@
 #include <iostream>
 
-int main(int argc, char **argv) {
+int main(void) {
     int cuda_devices = 0;
     std::cout << "CUDA version: " << CUDART_VERSION << "\n";
     cudaGetDeviceCount(&cuda_devices);

test cases/cuda/4 shared/main.cu

@@ -3,7 +3,7 @@
 #include "shared/kernels.h"
 
 
-int main(int argc, char **argv) {
+int main(void) {
     int cuda_devices = 0;
     cudaGetDeviceCount(&cuda_devices);
     if(cuda_devices == 0) {

test cases/cuda/5 threads/main.cu

@@ -3,7 +3,7 @@
 #include "shared/kernels.h"
 
 
-int main(int argc, char **argv) {
+int main(void) {
     int cuda_devices = 0;
     cudaGetDeviceCount(&cuda_devices);
     if(cuda_devices == 0) {

test cases/cuda/6 std/main.cu

@@ -1,14 +1,14 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
-auto cuda_devices() {
+auto cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;
 }
 
 
-int main() {
+int main(void) {
     int n = cuda_devices();
     if (n == 0) {
         std::cout << "No Cuda hardware found. Exiting.\n";

test cases/cuda/7 static vs runtime/main.cu

@@ -1,14 +1,14 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
-int cuda_devices() {
+int cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;
 }
 
 
-int main() {
+int main(void) {
     int n = cuda_devices();
     if (n == 0) {
         std::cout << "No Cuda hardware found. Exiting.\n";

test cases/cuda/8 release/main.cu

@@ -1,14 +1,14 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
-int cuda_devices() {
+int cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;
 }
 
 
-int main() {
+int main(void) {
     int n = cuda_devices();
     if (n == 0) {
         std::cout << "No Cuda hardware found. Exiting.\n";

test cases/cuda/9 optimize for space/main.cu

@@ -1,14 +1,14 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
-int cuda_devices() {
+int cuda_devices(void) {
     int result = 0;
     cudaGetDeviceCount(&result);
     return result;
 }
 
 
-int main() {
+int main(void) {
     int n = cuda_devices();
     if (n == 0) {
         std::cout << "No Cuda hardware found. Exiting.\n";