Skip to content

Commit d7c0642

Browse files
author
Kent Knox
committed
Merge branch 'develop'
2 parents d044006 + 468829a commit d7c0642

174 files changed

Lines changed: 3166 additions & 439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
# Copyright 2015 Vratis, Ltd.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
# ########################################################################
17+
118
# We require 2.8.10 because of the added support to download from https URL's
219
cmake_minimum_required( VERSION 2.8.10 )
320

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ clSPARSE is primarily written with C++ using C++11 core features. It does expor
6767
a 'C' interface for compatibility with other languages.
6868

6969
### How to build clSPARSE for your platform
70-
A [Build primer](https://github.com/kknox/clSPARSE/wiki/Build) is available on
70+
A [Build primer](https://github.com/clMathLibraries/clSPARSE/wiki/Build) is available on
7171
the wiki, which describes how to use cmake to generate platforms specific build
7272
files
7373

‎cmake/ExternalBoost.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# ########################################################################
16+
117
message( STATUS "Configuring Boost SuperBuild..." )
218
include( ExternalProject )
319

‎cmake/ExternalGmock.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# ########################################################################
16+
117
message( STATUS "Configuring gMock SuperBuild..." )
218
include( ExternalProject )
319

‎cmake/ExternalMTX.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# ########################################################################
16+
117
message( STATUS "Downloading MTX sparse Matrix Market files..." )
218

319
option( DOWNLOAD_MTX_BELL_GARLAND "Sparse matrix files used in Bell-Garlands paper" OFF )

‎cmake/ExternalclBLAS.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# ########################################################################
16+
117
message( STATUS "Configuring clBLAS SuperBuild..." )
218
include( ExternalProject )
319

‎docs/performance/clSPARSE-0.6.0.0/W9100/Coo2Csr.csv‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
coo2csr,,
2+
,,
3+
OpenCL runtime:,1642.5 (VM),
4+
OpenCL Device:,w9100,
5+
,,Gi-Elements/s
6+
cant,,0.221
7+
consph,,0.278
8+
cop20k_A,,0.232
9+
mac_econ_fwd500,,0.173
10+
mc2depi,,0.209
11+
pdb1HYS,,0.261
12+
pwtk,,0.304
13+
rail4284,,0.305
14+
rma10,,0.230
15+
scircuit,,0.146
16+
shipsec1,,0.551
17+
webbase_1M,,0.234

‎docs/performance/clSPARSE-0.6.0.0/W9100/clsparse-bench.sh‎

Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,53 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# ########################################################################
16+
117
#!/bin/bash
218

319
#Executable
4-
clsparse_bench=~/code/github/clMathLibraries/bin/clSPARSE/release/clSPARSE-build/staging/clsparse-bench
20+
bench_root_dir=~/code/github/kknox/bin/clSPARSE/release/clSPARSE-build/staging
21+
clsparse_bench=${bench_root_dir}/clsparse-bench
22+
function=spmdv
523

624
#Data directories
7-
mtx_cant=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cant
8-
mtx_consph=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/consph
9-
mtx_cop20k_A=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cop20k_A
10-
mtx_mac_econ_fwd500=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mac_econ_fwd500
11-
mtx_mc2depi=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mc2depi
12-
mtx_pdb1HYS=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pdb1HYS
13-
mtx_pwtk=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pwtk
14-
mtx_rail4284=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rail4284
15-
mtx_rma10=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rma10
16-
mtx_scircuit=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/scircuit
17-
mtx_shipsec1=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/shipsec1
18-
mtx_webbase_1M=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/webbase-1M
25+
data_root_dir=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland
26+
mtx_cant=${data_root_dir}/cant
27+
mtx_consph=${data_root_dir}/consph
28+
mtx_cop20k_A=${data_root_dir}/cop20k_A
29+
mtx_mac_econ_fwd500=${data_root_dir}/mac_econ_fwd500
30+
mtx_mc2depi=${data_root_dir}/mc2depi
31+
mtx_pdb1HYS=${data_root_dir}/pdb1HYS
32+
mtx_pwtk=${data_root_dir}/pwtk
33+
mtx_rail4284=${data_root_dir}/rail4284
34+
mtx_rma10=${data_root_dir}/rma10
35+
mtx_scircuit=${data_root_dir}/scircuit
36+
mtx_shipsec1=${data_root_dir}/shipsec1
37+
mtx_webbase_1M=${data_root_dir}/webbase-1M
1938

20-
clsparse_timing_dir=timings/spm-dv/14.301
39+
clsparse_timing_dir=timings/${function}/14.301
2140
mkdir -p ${clsparse_timing_dir}
22-
${clsparse_bench} -f spmdv -d ${mtx_cant} > ${clsparse_timing_dir}/cant.txt
23-
${clsparse_bench} -f spmdv -d ${mtx_consph} > ${clsparse_timing_dir}/consph.txt
24-
${clsparse_bench} -f spmdv -d ${mtx_cop20k_A} > ${clsparse_timing_dir}/cop20k_A.txt
25-
${clsparse_bench} -f spmdv -d ${mtx_mac_econ_fwd500} > ${clsparse_timing_dir}/mac_econ_fwd500.txt
26-
${clsparse_bench} -f spmdv -d ${mtx_mc2depi} > ${clsparse_timing_dir}/mc2depi.txt
27-
${clsparse_bench} -f spmdv -d ${mtx_pdb1HYS} > ${clsparse_timing_dir}/pdb1HYS.txt
28-
${clsparse_bench} -f spmdv -d ${mtx_pwtk} > ${clsparse_timing_dir}/pwtk.txt
29-
${clsparse_bench} -f spmdv -d ${mtx_rail4284} > ${clsparse_timing_dir}/rail4284.txt
30-
${clsparse_bench} -f spmdv -d ${mtx_rma10} > ${clsparse_timing_dir}/rma10.txt
31-
${clsparse_bench} -f spmdv -d ${mtx_scircuit} > ${clsparse_timing_dir}/scircuit.txt
32-
${clsparse_bench} -f spmdv -d ${mtx_shipsec1} > ${clsparse_timing_dir}/shipsec1.txt
33-
${clsparse_bench} -f spmdv -d ${mtx_webbase_1M} > ${clsparse_timing_dir}/webbase_1M.txt
41+
42+
${clsparse_bench} -f ${function} -d ${mtx_cant} > ${clsparse_timing_dir}/cant.txt
43+
${clsparse_bench} -f ${function} -d ${mtx_consph} > ${clsparse_timing_dir}/consph.txt
44+
${clsparse_bench} -f ${function} -d ${mtx_cop20k_A} > ${clsparse_timing_dir}/cop20k_A.txt
45+
${clsparse_bench} -f ${function} -d ${mtx_mac_econ_fwd500} > ${clsparse_timing_dir}/mac_econ_fwd500.txt
46+
${clsparse_bench} -f ${function} -d ${mtx_mc2depi} > ${clsparse_timing_dir}/mc2depi.txt
47+
${clsparse_bench} -f ${function} -d ${mtx_pdb1HYS} > ${clsparse_timing_dir}/pdb1HYS.txt
48+
${clsparse_bench} -f ${function} -d ${mtx_pwtk} > ${clsparse_timing_dir}/pwtk.txt
49+
${clsparse_bench} -f ${function} -d ${mtx_rail4284} > ${clsparse_timing_dir}/rail4284.txt
50+
${clsparse_bench} -f ${function} -d ${mtx_rma10} > ${clsparse_timing_dir}/rma10.txt
51+
${clsparse_bench} -f ${function} -d ${mtx_scircuit} > ${clsparse_timing_dir}/scircuit.txt
52+
${clsparse_bench} -f ${function} -d ${mtx_shipsec1} > ${clsparse_timing_dir}/shipsec1.txt
53+
${clsparse_bench} -f ${function} -d ${mtx_webbase_1M} > ${clsparse_timing_dir}/webbase_1M.txt

‎docs/performance/cuSPARSE-7.0/Tesla_K40/Coo2Csr.csv‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Coo2Csr,,
2+
,,
3+
CUDA driver:,346.47,
4+
OpenCL Device:,k40c,
5+
,,Gi-Elements/s
6+
cant,,0.312
7+
consph,,0.032
8+
cop20k_A,,0.001
9+
mac_econ_fwd500,,0.152
10+
mc2depi,,0.233
11+
pdb1HYS,,0.062
12+
pwtk,,0.016
13+
rail4284,,0.071
14+
rma10,,0.020
15+
scircuit,,0.002
16+
shipsec1,,0.052
17+
webbase_1M,,0.001

‎docs/performance/cuSPARSE-7.0/Tesla_K40/cusparse-bench.sh‎

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,53 @@
1+
# ########################################################################
2+
# Copyright 2015 Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# ########################################################################
16+
117
#!/bin/bash
218

319
#Executable
4-
cusparse_bench=~/code/github/clMathLibraries/bin/clSPARSE/release/clSPARSE-build/staging/cusparse-bench
20+
bench_root_dir=~/code/github/kknox/bin/clsparse/release/clSPARSE-build/staging
21+
cusparse_bench=${bench_root_dir}/cusparse-bench
22+
function=spmdv
523

624
#Data directories
7-
mtx_cant=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cant
8-
mtx_consph=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/consph
9-
mtx_cop20k_A=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cop20k_A
10-
mtx_mac_econ_fwd500=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mac_econ_fwd500
11-
mtx_mc2depi=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mc2depi
12-
mtx_pdb1HYS=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pdb1HYS
13-
mtx_pwtk=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pwtk
14-
mtx_rail4284=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rail4284
15-
mtx_rma10=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rma10
16-
mtx_scircuit=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/scircuit
17-
mtx_shipsec1=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/shipsec1
18-
mtx_webbase_1M=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/webbase-1M
25+
data_root_dir=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland
26+
mtx_cant=${data_root_dir}/cant
27+
mtx_consph=${data_root_dir}/consph
28+
mtx_cop20k_A=${data_root_dir}/cop20k_A
29+
mtx_mac_econ_fwd500=${data_root_dir}/mac_econ_fwd500
30+
mtx_mc2depi=${data_root_dir}/mc2depi
31+
mtx_pdb1HYS=${data_root_dir}/pdb1HYS
32+
mtx_pwtk=${data_root_dir}/pwtk
33+
mtx_rail4284=${data_root_dir}/rail4284
34+
mtx_rma10=${data_root_dir}/rma10
35+
mtx_scircuit=${data_root_dir}/scircuit
36+
mtx_shipsec1=${data_root_dir}/shipsec1
37+
mtx_webbase_1M=${data_root_dir}/webbase-1M
38+
39+
cusparse_timing_dir=timings/${function}/346.47
40+
mkdir -p ${cusparse_timing_dir}
1941

20-
mkdir -p timings-cusparse-spmdv
21-
${cusparse_bench} -f spmdv -d ${mtx_cant} > timings-cusparse-spmdv/cant.txt
22-
${cusparse_bench} -f spmdv -d ${mtx_consph} > timings-cusparse-spmdv/consph.txt
23-
${cusparse_bench} -f spmdv -d ${mtx_cop20k_A} > timings-cusparse-spmdv/cop20k_A.txt
24-
${cusparse_bench} -f spmdv -d ${mtx_mac_econ_fwd500} > timings-cusparse-spmdv/mac_econ_fwd500.txt
25-
${cusparse_bench} -f spmdv -d ${mtx_mc2depi} > timings-cusparse-spmdv/mc2depi.txt
26-
${cusparse_bench} -f spmdv -d ${mtx_pdb1HYS} > timings-cusparse-spmdv/pdb1HYS.txt
27-
${cusparse_bench} -f spmdv -d ${mtx_pwtk} > timings-cusparse-spmdv/pwtk.txt
28-
${cusparse_bench} -f spmdv -d ${mtx_rail4284} > timings-cusparse-spmdv/rail4284.txt
29-
${cusparse_bench} -f spmdv -d ${mtx_rma10} > timings-cusparse-spmdv/rma10.txt
30-
${cusparse_bench} -f spmdv -d ${mtx_scircuit} > timings-cusparse-spmdv/scircuit.txt
31-
${cusparse_bench} -f spmdv -d ${mtx_shipsec1} > timings-cusparse-spmdv/shipsec1.txt
32-
${cusparse_bench} -f spmdv -d ${mtx_webbase_1M} > timings-cusparse-spmdv/webbase_1M.txt
42+
${cusparse_bench} -f ${function} -d ${mtx_cant} > ${cusparse_timing_dir}/cant.txt
43+
${cusparse_bench} -f ${function} -d ${mtx_consph} > ${cusparse_timing_dir}/consph.txt
44+
${cusparse_bench} -f ${function} -d ${mtx_cop20k_A} > ${cusparse_timing_dir}/cop20k_A.txt
45+
${cusparse_bench} -f ${function} -d ${mtx_mac_econ_fwd500} > ${cusparse_timing_dir}/mac_econ_fwd500.txt
46+
${cusparse_bench} -f ${function} -d ${mtx_mc2depi} > ${cusparse_timing_dir}/mc2depi.txt
47+
${cusparse_bench} -f ${function} -d ${mtx_pdb1HYS} > ${cusparse_timing_dir}/pdb1HYS.txt
48+
${cusparse_bench} -f ${function} -d ${mtx_pwtk} > ${cusparse_timing_dir}/pwtk.txt
49+
${cusparse_bench} -f ${function} -d ${mtx_rail4284} > ${cusparse_timing_dir}/rail4284.txt
50+
${cusparse_bench} -f ${function} -d ${mtx_rma10} > ${cusparse_timing_dir}/rma10.txt
51+
${cusparse_bench} -f ${function} -d ${mtx_scircuit} > ${cusparse_timing_dir}/scircuit.txt
52+
${cusparse_bench} -f ${function} -d ${mtx_shipsec1} > ${cusparse_timing_dir}/shipsec1.txt
53+
${cusparse_bench} -f ${function} -d ${mtx_webbase_1M} > ${cusparse_timing_dir}/webbase_1M.txt

0 commit comments

Comments
 (0)