From 6abb08174aa3963ab1ab56105652105d629be274 Mon Sep 17 00:00:00 2001 From: mkitez Date: Tue, 30 Jun 2020 15:09:13 +0300 Subject: [PATCH 1/2] Moving CI tests from .ci to sample.json --- .ci/samples_linux.json | 98 ------------------- .../DenseLinearAlgebra/simple-add/sample.json | 62 +++++++++++- .../DenseLinearAlgebra/vector-add/sample.json | 63 +++++++++++- 3 files changed, 123 insertions(+), 100 deletions(-) delete mode 100644 .ci/samples_linux.json diff --git a/.ci/samples_linux.json b/.ci/samples_linux.json deleted file mode 100644 index 91b8367b9b..0000000000 --- a/.ci/samples_linux.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "samples": [ - { - "path": "DirectProgramming/DPC++/DenseLinearAlgebra/vector-add", - "configurations": [ - { - "id": "cpu_buffers", - "build": [ - "make all" - ], - "run": [ - "make run" - ], - "clean": [ - "make clean" - ] - }, - { - "id": "cpu_usm", - "build": [ - "make build_usm" - ], - "run": [ - "make run_usm" - ], - "clean": [ - "make clean" - ] - }, - { - "id": "fpga_emu_buffers", - "build": [ - "make clean -f Makefile.fpga", - "make fpga_emu -f Makefile.fpga" - ], - "run": [ - "make run_emu -f Makefile.fpga" - ] - }, - { - "id": "fpga_report_buffers", - "build": [ - "make report -f Makefile.fpga" - ], - "clean": [ - "make clean -f Makefile.fpga" - ] - } - ] - }, - { - "path": "DirectProgramming/DPC++/DenseLinearAlgebra/simple-add", - "configurations": [ - { - "id": "cpu_usm", - "build": [ - "make all" - ], - "run": [ - "make run" - ], - "clean": [ - "make clean" - ] - }, - { - "id": "cpu_buffers", - "build": [ - "make build_buffers" - ], - "run": [ - "make run_buffers" - ], - "clean": [ - "make clean" - ] - }, - { - "id": "fpga_emu_buffers", - "build": [ - "make clean -f Makefile.fpga", - "make fpga_emu -f Makefile.fpga" - ], - "run": [ - "make run_emu -f Makefile.fpga" - ] - }, - { - "id": "fpga_repots_buffers", - "build": [ - "make clean -f Makefile.fpga", - "make report -f Makefile.fpga" - ] - } - ] - } - ] -} diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index 932eb12097..74cadb2120 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -6,5 +6,65 @@ "languages": [{"cpp": {"properties": {"projectOptions": [{"projectType": "makefile"}]}}}], "targetDevice": ["CPU", "GPU", "FPGA"], "os": ["linux", "windows"], - "builder": ["ide", "make"] + "builder": ["ide", "make"], + "ciTests": { + "linux": [ + { + "id": "cpu_usm", + "steps": [ + "make all", + "make run", + "make clean" + ] + }, + { + "id": "cpu_buffers", + "steps": [ + "make build_buffers", + "make run_buffers", + "make clean" + ] + }, + { + "id": "fpga_emu_buffers", + "steps": [ + "make fpga_emu -f Makefile.fpga", + "make run_emu -f Makefile.fpga", + "make clean -f Makefile.fpga" + ] + }, + { + "id": "fpga_report_buffers", + "steps": [ + "make report -f Makefile.fpga" + ] + } + ], + "windows": [ + { + "id": "cpu_usm", + "steps": [ + "nmake -f Makefile.win", + "nmake -f Makefile.win run", + "nmake -f Makefile.win clean" + ] + }, + { + "id": "cpu_buffers", + "steps": [ + "nmake -f Makefile.win build_buffers", + "nmake -f Makefile.win run_buffers", + "nmake -f Makefile.win clean" + ] + }, + { + "id": "fpga_emu_buffers", + "steps": [ + "nmake -f Makefile.win.fpga", + "nmake -f Makefile.win.fpga run", + "nmake -f Makefile.win.fpga clean" + ] + } + ] + } } diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json index 0698a5fb5b..4e0be2b292 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json @@ -6,5 +6,66 @@ "languages": [{"cpp": {"properties": {"projectOptions": [{"projectType": "makefile"}]}}}], "targetDevice": ["CPU", "GPU", "FPGA"], "os": ["linux", "windows"], - "builder": ["ide", "make"] + "builder": ["ide", "make"], + "ciTests": { + "linux": [ + { + "id": "cpu_buffers", + "steps": [ + "make all", + "make run", + "make clean" + ] + }, + { + "id": "cpu_usm", + "steps": [ + "make build_usm", + "make run_usm", + "make clean" + ] + }, + { + "id": "fpga_emu_buffers", + "steps": [ + "make fpga_emu -f Makefile.fpga", + "make run_emu -f Makefile.fpga", + "make clean -f Makefile.fpga" + ] + }, + { + "id": "fpga_report_buffers", + "steps": [ + "make report -f Makefile.fpga", + "make clean -f Makefile.fpga" + ] + } + ], + "windows": [ + { + "id": "cpu_buffers", + "steps": [ + "nmake -f Makefile.win", + "nmake -f Makefile.win run", + "nmake -f Makefile.win clean" + ] + }, + { + "id": "cpu_usm", + "steps": [ + "nmake -f Makefile.win build_usm" + "nmake -f Makefile.win run_usm", + "nmake -f Makefile.win clean" + ] + }, + { + "id": "fpga_emu_buffers", + "steps": [ + "nmake -f Makefile.win.fpga", + "nmake -f Makefile.win.fpga run", + "nmake -f Makefile.win.fpga clean" + ] + } + ] + } } From 0bf51a7258d985c8b9fb672d6a3786c6822afd49 Mon Sep 17 00:00:00 2001 From: mkitez Date: Tue, 30 Jun 2020 15:26:08 +0300 Subject: [PATCH 2/2] Added missing comma --- .../DPC++/DenseLinearAlgebra/vector-add/sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json index 4e0be2b292..ff974f445e 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json @@ -53,7 +53,7 @@ { "id": "cpu_usm", "steps": [ - "nmake -f Makefile.win build_usm" + "nmake -f Makefile.win build_usm", "nmake -f Makefile.win run_usm", "nmake -f Makefile.win clean" ]