From 855d889f4a47c2aced24385806b37f29719a1a0e Mon Sep 17 00:00:00 2001 From: mkitez Date: Wed, 10 Jun 2020 09:24:53 +0300 Subject: [PATCH 01/12] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a7c4068c8..70b89308ed 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# oneAPI-samples \ No newline at end of file +# oneAPI-samples + +Test update From e8c5145688a68c16ae33a2788eeb0db8bb67bb75 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Thu, 11 Jun 2020 16:51:59 +0300 Subject: [PATCH 02/12] Added CI configurations for simple-add --- .../DenseLinearAlgebra/simple-add/sample.json | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index 932eb12097..26d2d4e014 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -6,5 +6,50 @@ "languages": [{"cpp": {"properties": {"projectOptions": [{"projectType": "makefile"}]}}}], "targetDevice": ["CPU", "GPU", "FPGA"], "os": ["linux", "windows"], - "builder": ["ide", "make"] + "builder": ["ide", "make"], + "configurations": { + "linux": [ + { + "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" + ] + } + ] + } } From 7c9484ee8655377c77378f83db47b28c718a53c7 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Thu, 11 Jun 2020 17:38:13 +0300 Subject: [PATCH 03/12] Bump --- .../DenseLinearAlgebra/simple-add/sample.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index 26d2d4e014..dab7e05d80 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -8,48 +8,48 @@ "os": ["linux", "windows"], "builder": ["ide", "make"], "configurations": { - "linux": [ - { - "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" - ] - } - ] + "linux": [ + { + "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" + ] + } + ] } } From e24230665d1f5b9a75c3ffe02f07c9d793dd9b88 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Tue, 16 Jun 2020 10:32:24 +0300 Subject: [PATCH 04/12] Bump --- .../DPC++/DenseLinearAlgebra/simple-add/sample.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index dab7e05d80..28c5d79fd1 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -12,13 +12,13 @@ { "id": "cpu_usm", "build": [ - "make all" + "make all" ], "run": [ - "make run" + "make run" ], "clean": [ - "make clean" + "make clean" ] }, { From 5f42b8f79d78dd0d239d8a121952533be8802675 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Tue, 16 Jun 2020 15:17:42 +0300 Subject: [PATCH 05/12] Added Windows configurations --- .../DenseLinearAlgebra/simple-add/sample.json | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index 28c5d79fd1..352209222b 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -50,6 +50,30 @@ "make report -f Makefile.fpga" ] } - ] + ], + "windows": [ + { + "id": "cpu_usm", + "build": [ + "nmake -f Makefile.win" + ], + "run": [ + "nmake -f Makefile.win run" + ], + "clean": [ + "nmake -f Makefile.win clean" + ] + }, + { + "id": "fpga_emu_buffers", + "build": [ + "nmake -f Makefile.win.fpga clean", + "nmake -f Makefile.win.fpga" + ], + "run": [ + "nmake -f Makefile.win.fpga run" + ] + } + ] } } From 47dd1904de79e0ba2bd5d799a1f30c5a98f71c15 Mon Sep 17 00:00:00 2001 From: mkitez Date: Fri, 19 Jun 2020 10:00:44 +0300 Subject: [PATCH 06/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70b89308ed..5940a906c5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # oneAPI-samples -Test update +Test update. From c785287b0697de7aa378a3d5e830b1b7608cac70 Mon Sep 17 00:00:00 2001 From: mkitez Date: Fri, 19 Jun 2020 17:51:21 +0300 Subject: [PATCH 07/12] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 106cfa66c4..b83410cdae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # oneAPI-samples - This is the readme. Test update. From 37c995b553c153d7f8305f6c84e3cdbe2931b8b9 Mon Sep 17 00:00:00 2001 From: mkitez Date: Mon, 22 Jun 2020 09:35:01 +0300 Subject: [PATCH 08/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b83410cdae..a54ef5f06f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # oneAPI-samples This is the readme. -Test update. +Test update here. From 576d64bd2ec6c8a8241870c3d3ef0a029bbd0d54 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Mon, 22 Jun 2020 10:39:40 +0300 Subject: [PATCH 09/12] Test update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a54ef5f06f..7a66a482b6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # oneAPI-samples This is the readme. -Test update here. +A test update here. From 17848e57e908bb1a4dd5da6ebcee289c0d670418 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Tue, 23 Jun 2020 18:50:06 +0300 Subject: [PATCH 10/12] Adding ciTests field for simple-add sample --- .../DenseLinearAlgebra/simple-add/sample.json | 80 +++++++------------ 1 file changed, 31 insertions(+), 49 deletions(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index 352209222b..e0fc4660f0 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -7,73 +7,55 @@ "targetDevice": ["CPU", "GPU", "FPGA"], "os": ["linux", "windows"], "builder": ["ide", "make"], - "configurations": { + "ciTests": { "linux": [ { "id": "cpu_usm", - "build": [ - "make all" - ], - "run": [ - "make run" - ], - "clean": [ - "make clean" + "steps": [ + [ "make all" ], + [ "make run" ], + [ "make clean" ] ] }, { "id": "cpu_buffers", - "build": [ - "make build_buffers" - ], - "run": [ - "make run_buffers" - ], - "clean": [ - "make clean" + "steps": [ + [ "make build_buffers" ], + [ "make run_buffers"], + [ "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" + "steps": [ + [ "make clean -f Makefile.fpga", "make fpga_emu -f Makefile.fpga" ], + [ "make run_emu -f Makefile.fpga" ] ] }, { "id": "fpga_repots_buffers", - "build": [ - "make clean -f Makefile.fpga", - "make report -f Makefile.fpga" + "steps": [ + [ "make clean -f Makefile.fpga" ], + [ "make report -f Makefile.fpga" ] ] } ], "windows": [ - { - "id": "cpu_usm", - "build": [ - "nmake -f Makefile.win" - ], - "run": [ - "nmake -f Makefile.win run" - ], - "clean": [ - "nmake -f Makefile.win clean" - ] - }, - { - "id": "fpga_emu_buffers", - "build": [ - "nmake -f Makefile.win.fpga clean", - "nmake -f Makefile.win.fpga" - ], - "run": [ - "nmake -f Makefile.win.fpga run" - ] - } - ] + { + "id": "cpu_usm", + "steps": [ + [ "nmake -f Makefile.win" ], + [ "nmake -f Makefile.win run" ], + [ "nmake -f Makefile.win clean" ] + ] + }, + { + "id": "fpga_emu_buffers", + "steps": [ + [ "nmake -f Makefile.win.fpga clean", "nmake -f Makefile.win.fpga" ], + [ "nmake -f Makefile.win.fpga run" ] + ] + } + ] } } From a90b08cd2858c517466cc54993d15546e94a8cd1 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Tue, 23 Jun 2020 18:52:36 +0300 Subject: [PATCH 11/12] Adding ciTests field for vector-add sample --- .../DPC++/DenseLinearAlgebra/vector-add/sample.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json index 0698a5fb5b..5ee23e9cff 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json @@ -6,5 +6,9 @@ "languages": [{"cpp": {"properties": {"projectOptions": [{"projectType": "makefile"}]}}}], "targetDevice": ["CPU", "GPU", "FPGA"], "os": ["linux", "windows"], - "builder": ["ide", "make"] + "builder": ["ide", "make"], + "ciTests": { + "linux": [], + "windows": [] + } } From 09b5d488be07dc2bd11341784bbbef26d3687bc4 Mon Sep 17 00:00:00 2001 From: "Poroshin, Roman" Date: Thu, 25 Jun 2020 19:33:31 +0300 Subject: [PATCH 12/12] Updating ciTests/steps format --- .../DenseLinearAlgebra/simple-add/sample.json | 33 ++++++++++--------- .../DenseLinearAlgebra/vector-add/sample.json | 20 +++++++++-- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json index e0fc4660f0..00ac76b848 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/simple-add/sample.json @@ -12,31 +12,31 @@ { "id": "cpu_usm", "steps": [ - [ "make all" ], - [ "make run" ], - [ "make clean" ] + "make all", + "make run", + "make clean" ] }, { "id": "cpu_buffers", "steps": [ - [ "make build_buffers" ], - [ "make run_buffers"], - [ "make clean" ] + "make build_buffers", + "make run_buffers", + "make clean" ] }, { "id": "fpga_emu_buffers", "steps": [ - [ "make clean -f Makefile.fpga", "make fpga_emu -f Makefile.fpga" ], - [ "make run_emu -f Makefile.fpga" ] + "make fpga_emu -f Makefile.fpga", + "make run_emu -f Makefile.fpga", + "make clean -f Makefile.fpga" ] }, { - "id": "fpga_repots_buffers", + "id": "fpga_report_buffers", "steps": [ - [ "make clean -f Makefile.fpga" ], - [ "make report -f Makefile.fpga" ] + "make report -f Makefile.fpga" ] } ], @@ -44,16 +44,17 @@ { "id": "cpu_usm", "steps": [ - [ "nmake -f Makefile.win" ], - [ "nmake -f Makefile.win run" ], - [ "nmake -f Makefile.win clean" ] + "nmake -f Makefile.win", + "nmake -f Makefile.win run", + "nmake -f Makefile.win clean" ] }, { "id": "fpga_emu_buffers", "steps": [ - [ "nmake -f Makefile.win.fpga clean", "nmake -f Makefile.win.fpga" ], - [ "nmake -f Makefile.win.fpga run" ] + "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 5ee23e9cff..e0a455854a 100644 --- a/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json +++ b/DirectProgramming/DPC++/DenseLinearAlgebra/vector-add/sample.json @@ -8,7 +8,23 @@ "os": ["linux", "windows"], "builder": ["ide", "make"], "ciTests": { - "linux": [], - "windows": [] + "linux": [ + { + "steps": [ + "make all", + "make run", + "make clean" + ] + } + ], + "windows": [ + { + "steps": [ + "nmake -f Makefile.win", + "nmake -f Makefile.win run", + "nmake -f Makefile.win clean" + ] + } + ] } }