Merge branch 'develop'

clMathLibraries · Aug 6, 2015 · d7c0642 · d7c0642
2 parents d044006 + 468829a
commit d7c0642
Show file tree

Hide file tree

Showing 174 changed files with 3,166 additions and 439 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,20 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# Copyright 2015 Vratis, Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 # We require 2.8.10 because of the added support to download from https URL's
 cmake_minimum_required( VERSION 2.8.10 )
 

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ clSPARSE is primarily written with C++ using C++11 core features.  It does expor
 a 'C' interface for compatibility with other languages.
 
 ### How to build clSPARSE for your platform
-A [Build primer](https://github.com/kknox/clSPARSE/wiki/Build) is available on
+A [Build primer](https://github.com/clMathLibraries/clSPARSE/wiki/Build) is available on
 the wiki, which describes how to use cmake to generate platforms specific build
 files
 

diff --git a/cmake/ExternalBoost.cmake b/cmake/ExternalBoost.cmake
@@ -1,3 +1,19 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 message( STATUS "Configuring Boost SuperBuild..." )
 include( ExternalProject )
 

diff --git a/cmake/ExternalGmock.cmake b/cmake/ExternalGmock.cmake
@@ -1,3 +1,19 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 message( STATUS "Configuring gMock SuperBuild..." )
 include( ExternalProject )
 

diff --git a/cmake/ExternalMTX.cmake b/cmake/ExternalMTX.cmake
@@ -1,3 +1,19 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 message( STATUS "Downloading MTX sparse Matrix Market files..." )
 
 option( DOWNLOAD_MTX_BELL_GARLAND "Sparse matrix files used in Bell-Garlands paper" OFF )

diff --git a/cmake/ExternalclBLAS.cmake b/cmake/ExternalclBLAS.cmake
@@ -1,3 +1,19 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 message( STATUS "Configuring clBLAS SuperBuild..." )
 include( ExternalProject )
 

diff --git a/docs/performance/clSPARSE-0.6.0.0/W9100/Coo2Csr.csv b/docs/performance/clSPARSE-0.6.0.0/W9100/Coo2Csr.csv
@@ -0,0 +1,17 @@
+coo2csr,,
+,,
+OpenCL runtime:,1642.5 (VM),
+OpenCL Device:,w9100,
+,,Gi-Elements/s
+cant,,0.221
+consph,,0.278
+cop20k_A,,0.232
+mac_econ_fwd500,,0.173
+mc2depi,,0.209
+pdb1HYS,,0.261
+pwtk,,0.304
+rail4284,,0.305
+rma10,,0.230
+scircuit,,0.146
+shipsec1,,0.551
+webbase_1M,,0.234
diff --git a/docs/performance/clSPARSE-0.6.0.0/W9100/clsparse-bench.sh b/docs/performance/clSPARSE-0.6.0.0/W9100/clsparse-bench.sh
@@ -1,33 +1,53 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 #!/bin/bash
 
 #Executable
-clsparse_bench=~/code/github/clMathLibraries/bin/clSPARSE/release/clSPARSE-build/staging/clsparse-bench
+bench_root_dir=~/code/github/kknox/bin/clSPARSE/release/clSPARSE-build/staging
+clsparse_bench=${bench_root_dir}/clsparse-bench
+function=spmdv
 
 #Data directories
-mtx_cant=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cant
-mtx_consph=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/consph
-mtx_cop20k_A=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cop20k_A
-mtx_mac_econ_fwd500=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mac_econ_fwd500
-mtx_mc2depi=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mc2depi
-mtx_pdb1HYS=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pdb1HYS
-mtx_pwtk=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pwtk
-mtx_rail4284=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rail4284
-mtx_rma10=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rma10
-mtx_scircuit=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/scircuit
-mtx_shipsec1=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/shipsec1
-mtx_webbase_1M=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/webbase-1M
+data_root_dir=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland
+mtx_cant=${data_root_dir}/cant
+mtx_consph=${data_root_dir}/consph
+mtx_cop20k_A=${data_root_dir}/cop20k_A
+mtx_mac_econ_fwd500=${data_root_dir}/mac_econ_fwd500
+mtx_mc2depi=${data_root_dir}/mc2depi
+mtx_pdb1HYS=${data_root_dir}/pdb1HYS
+mtx_pwtk=${data_root_dir}/pwtk
+mtx_rail4284=${data_root_dir}/rail4284
+mtx_rma10=${data_root_dir}/rma10
+mtx_scircuit=${data_root_dir}/scircuit
+mtx_shipsec1=${data_root_dir}/shipsec1
+mtx_webbase_1M=${data_root_dir}/webbase-1M
 
-clsparse_timing_dir=timings/spm-dv/14.301
+clsparse_timing_dir=timings/${function}/14.301
 mkdir -p ${clsparse_timing_dir}
-${clsparse_bench} -f spmdv -d ${mtx_cant} > ${clsparse_timing_dir}/cant.txt
-${clsparse_bench} -f spmdv -d ${mtx_consph} > ${clsparse_timing_dir}/consph.txt
-${clsparse_bench} -f spmdv -d ${mtx_cop20k_A} > ${clsparse_timing_dir}/cop20k_A.txt
-${clsparse_bench} -f spmdv -d ${mtx_mac_econ_fwd500} > ${clsparse_timing_dir}/mac_econ_fwd500.txt
-${clsparse_bench} -f spmdv -d ${mtx_mc2depi} > ${clsparse_timing_dir}/mc2depi.txt
-${clsparse_bench} -f spmdv -d ${mtx_pdb1HYS} > ${clsparse_timing_dir}/pdb1HYS.txt
-${clsparse_bench} -f spmdv -d ${mtx_pwtk} > ${clsparse_timing_dir}/pwtk.txt
-${clsparse_bench} -f spmdv -d ${mtx_rail4284} > ${clsparse_timing_dir}/rail4284.txt
-${clsparse_bench} -f spmdv -d ${mtx_rma10} > ${clsparse_timing_dir}/rma10.txt
-${clsparse_bench} -f spmdv -d ${mtx_scircuit} > ${clsparse_timing_dir}/scircuit.txt
-${clsparse_bench} -f spmdv -d ${mtx_shipsec1} > ${clsparse_timing_dir}/shipsec1.txt
-${clsparse_bench} -f spmdv -d ${mtx_webbase_1M} > ${clsparse_timing_dir}/webbase_1M.txt
+
+${clsparse_bench} -f ${function} -d ${mtx_cant} > ${clsparse_timing_dir}/cant.txt
+${clsparse_bench} -f ${function} -d ${mtx_consph} > ${clsparse_timing_dir}/consph.txt
+${clsparse_bench} -f ${function} -d ${mtx_cop20k_A} > ${clsparse_timing_dir}/cop20k_A.txt
+${clsparse_bench} -f ${function} -d ${mtx_mac_econ_fwd500} > ${clsparse_timing_dir}/mac_econ_fwd500.txt
+${clsparse_bench} -f ${function} -d ${mtx_mc2depi} > ${clsparse_timing_dir}/mc2depi.txt
+${clsparse_bench} -f ${function} -d ${mtx_pdb1HYS} > ${clsparse_timing_dir}/pdb1HYS.txt
+${clsparse_bench} -f ${function} -d ${mtx_pwtk} > ${clsparse_timing_dir}/pwtk.txt
+${clsparse_bench} -f ${function} -d ${mtx_rail4284} > ${clsparse_timing_dir}/rail4284.txt
+${clsparse_bench} -f ${function} -d ${mtx_rma10} > ${clsparse_timing_dir}/rma10.txt
+${clsparse_bench} -f ${function} -d ${mtx_scircuit} > ${clsparse_timing_dir}/scircuit.txt
+${clsparse_bench} -f ${function} -d ${mtx_shipsec1} > ${clsparse_timing_dir}/shipsec1.txt
+${clsparse_bench} -f ${function} -d ${mtx_webbase_1M} > ${clsparse_timing_dir}/webbase_1M.txt
diff --git a/docs/performance/cuSPARSE-7.0/Tesla_K40/Coo2Csr.csv b/docs/performance/cuSPARSE-7.0/Tesla_K40/Coo2Csr.csv
@@ -0,0 +1,17 @@
+Coo2Csr,,
+,,
+CUDA driver:,346.47,
+OpenCL Device:,k40c,
+,,Gi-Elements/s
+cant,,0.312
+consph,,0.032
+cop20k_A,,0.001
+mac_econ_fwd500,,0.152
+mc2depi,,0.233
+pdb1HYS,,0.062
+pwtk,,0.016
+rail4284,,0.071
+rma10,,0.020
+scircuit,,0.002
+shipsec1,,0.052
+webbase_1M,,0.001
diff --git a/docs/performance/cuSPARSE-7.0/Tesla_K40/cusparse-bench.sh b/docs/performance/cuSPARSE-7.0/Tesla_K40/cusparse-bench.sh
@@ -1,32 +1,53 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 #!/bin/bash
 
 #Executable
-cusparse_bench=~/code/github/clMathLibraries/bin/clSPARSE/release/clSPARSE-build/staging/cusparse-bench
+bench_root_dir=~/code/github/kknox/bin/clsparse/release/clSPARSE-build/staging
+cusparse_bench=${bench_root_dir}/cusparse-bench
+function=spmdv
 
 #Data directories
-mtx_cant=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cant
-mtx_consph=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/consph
-mtx_cop20k_A=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/cop20k_A
-mtx_mac_econ_fwd500=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mac_econ_fwd500
-mtx_mc2depi=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/mc2depi
-mtx_pdb1HYS=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pdb1HYS
-mtx_pwtk=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/pwtk
-mtx_rail4284=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rail4284
-mtx_rma10=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/rma10
-mtx_scircuit=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/scircuit
-mtx_shipsec1=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/shipsec1
-mtx_webbase_1M=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland/webbase-1M
+data_root_dir=~/code/github/clMathLibraries/bin/deps/release/Externals/MTX/Bell_Garland
+mtx_cant=${data_root_dir}/cant
+mtx_consph=${data_root_dir}/consph
+mtx_cop20k_A=${data_root_dir}/cop20k_A
+mtx_mac_econ_fwd500=${data_root_dir}/mac_econ_fwd500
+mtx_mc2depi=${data_root_dir}/mc2depi
+mtx_pdb1HYS=${data_root_dir}/pdb1HYS
+mtx_pwtk=${data_root_dir}/pwtk
+mtx_rail4284=${data_root_dir}/rail4284
+mtx_rma10=${data_root_dir}/rma10
+mtx_scircuit=${data_root_dir}/scircuit
+mtx_shipsec1=${data_root_dir}/shipsec1
+mtx_webbase_1M=${data_root_dir}/webbase-1M
+
+cusparse_timing_dir=timings/${function}/346.47
+mkdir -p ${cusparse_timing_dir}
 
-mkdir -p timings-cusparse-spmdv
-${cusparse_bench} -f spmdv -d ${mtx_cant} > timings-cusparse-spmdv/cant.txt
-${cusparse_bench} -f spmdv -d ${mtx_consph} > timings-cusparse-spmdv/consph.txt
-${cusparse_bench} -f spmdv -d ${mtx_cop20k_A} > timings-cusparse-spmdv/cop20k_A.txt
-${cusparse_bench} -f spmdv -d ${mtx_mac_econ_fwd500} > timings-cusparse-spmdv/mac_econ_fwd500.txt
-${cusparse_bench} -f spmdv -d ${mtx_mc2depi} > timings-cusparse-spmdv/mc2depi.txt
-${cusparse_bench} -f spmdv -d ${mtx_pdb1HYS} > timings-cusparse-spmdv/pdb1HYS.txt
-${cusparse_bench} -f spmdv -d ${mtx_pwtk} > timings-cusparse-spmdv/pwtk.txt
-${cusparse_bench} -f spmdv -d ${mtx_rail4284} > timings-cusparse-spmdv/rail4284.txt
-${cusparse_bench} -f spmdv -d ${mtx_rma10} > timings-cusparse-spmdv/rma10.txt
-${cusparse_bench} -f spmdv -d ${mtx_scircuit} > timings-cusparse-spmdv/scircuit.txt
-${cusparse_bench} -f spmdv -d ${mtx_shipsec1} > timings-cusparse-spmdv/shipsec1.txt
-${cusparse_bench} -f spmdv -d ${mtx_webbase_1M} > timings-cusparse-spmdv/webbase_1M.txt
+${cusparse_bench} -f ${function} -d ${mtx_cant} > ${cusparse_timing_dir}/cant.txt
+${cusparse_bench} -f ${function} -d ${mtx_consph} > ${cusparse_timing_dir}/consph.txt
+${cusparse_bench} -f ${function} -d ${mtx_cop20k_A} > ${cusparse_timing_dir}/cop20k_A.txt
+${cusparse_bench} -f ${function} -d ${mtx_mac_econ_fwd500} > ${cusparse_timing_dir}/mac_econ_fwd500.txt
+${cusparse_bench} -f ${function} -d ${mtx_mc2depi} > ${cusparse_timing_dir}/mc2depi.txt
+${cusparse_bench} -f ${function} -d ${mtx_pdb1HYS} > ${cusparse_timing_dir}/pdb1HYS.txt
+${cusparse_bench} -f ${function} -d ${mtx_pwtk} > ${cusparse_timing_dir}/pwtk.txt
+${cusparse_bench} -f ${function} -d ${mtx_rail4284} > ${cusparse_timing_dir}/rail4284.txt
+${cusparse_bench} -f ${function} -d ${mtx_rma10} > ${cusparse_timing_dir}/rma10.txt
+${cusparse_bench} -f ${function} -d ${mtx_scircuit} > ${cusparse_timing_dir}/scircuit.txt
+${cusparse_bench} -f ${function} -d ${mtx_shipsec1} > ${cusparse_timing_dir}/shipsec1.txt
+${cusparse_bench} -f ${function} -d ${mtx_webbase_1M} > ${cusparse_timing_dir}/webbase_1M.txt
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -1,3 +1,19 @@
+# ########################################################################
+# Copyright 2015 Vratis, Ltd.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 cmake_minimum_required( VERSION 2.8.12 )
 project(samples)
 

diff --git a/samples/cmake/FindOpenCL.cmake b/samples/cmake/FindOpenCL.cmake
@@ -1,3 +1,19 @@
+# ########################################################################
+# Copyright 2015 Advanced Micro Devices, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ########################################################################
+
 
 # Locate an OpenCL implementation.
 # Currently supports AMD APP SDK (http://developer.amd.com/sdks/AMDAPPSDK/Pages/default.aspx/)

diff --git a/samples/sample-axpy.cpp b/samples/sample-axpy.cpp
@@ -1,3 +1,19 @@
+/* ************************************************************************
+ * Copyright 2015 Vratis, Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ************************************************************************ */
+
 #include <iostream>
 #include <vector>
 

diff --git a/samples/sample-cg.cpp b/samples/sample-cg.cpp
@@ -1,3 +1,19 @@
+/* ************************************************************************
+ * Copyright 2015 Vratis, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ************************************************************************ */
+
 #include <iostream>
 #include <vector>