diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2017-05-03 19:49:15 +0200 |
|---|---|---|
| committer | Cedric Nugteren <web@cedricnugteren.nl> | 2017-05-03 19:49:15 +0200 |
| commit | b0f365912159aa4d4435af211ae0a94cfbd8a977 (patch) | |
| tree | 7bec0d5cbf4fa511a9737fdab397b2970efd25c9 | |
| parent | 606f2871dda568bcb07bb0d08ee155f8bf1d5606 (diff) | |
The master branch is now the main 'development' branch
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | README.md | 6 |
4 files changed, 6 insertions, 7 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 69aecf20..bc8dca87 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -47,7 +47,7 @@ before_build: - ps: mkdir $env:CLBLAST_BUILD - ps: pushd $env:CLBLAST_BUILD - ps: mkdir install_dir - - cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DTESTS=ON -DCLIENTS=ON -DSAMPLES=ON %APPVEYOR_BUILD_FOLDER% + - cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DTESTS=ON -DCLIENTS=ON -DSAMPLES=ON -DNETLIB=ON %APPVEYOR_BUILD_FOLDER% build_script: - nmake diff --git a/.travis.yml b/.travis.yml index 6a47bbd7..f628bb94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: before_script: - mkdir -p ${CLBLAST_ROOT} - pushd ${CLBLAST_ROOT} - - cmake -DTESTS=ON -DCLIENTS=ON ${TRAVIS_BUILD_DIR} + - cmake -DTESTS=ON -DCLIENTS=ON -DSAMPLES=ON -DNETLIB=ON ${TRAVIS_BUILD_DIR} script: - make @@ -39,7 +39,6 @@ script: branches: only: - master - - development notifications: email: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f698d32..5b43d50b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,4 +17,4 @@ Pull requests are welcome as long as they: * Contain unit additions or modifications * Follow the CLBlast coding style, which is loosely based on the [Google C++ style guide](https://google-styleguide.googlecode.com/svn/trunk/cppguide.html) and the Effective C++ books by Scott Meyers. We use a tab-size of 2 spaces and a max-width of 100 characters. -* Are made against the `development` branch. +* Are made against the `master` branch. @@ -2,10 +2,10 @@ CLBlast: The tuned OpenCL BLAS library ================ -| | master | development | +| | master | |-----|-----|-----| -| Linux/OS X | [](https://travis-ci.org/CNugteren/CLBlast/branches) | [](https://travis-ci.org/CNugteren/CLBlast/branches) | -| Windows | [](https://ci.appveyor.com/project/CNugteren/clblast) | [](https://ci.appveyor.com/project/CNugteren/clblast) | +| Linux/OS X | [](https://travis-ci.org/CNugteren/CLBlast/branches) | +| Windows | [](https://ci.appveyor.com/project/CNugteren/clblast) | CLBlast is a modern, lightweight, performant and tunable OpenCL BLAS library written in C++11. It is designed to leverage the full performance potential of a wide variety of OpenCL devices from different vendors, including desktop and laptop GPUs, embedded GPUs, and other accelerators. CLBlast implements BLAS routines: basic linear algebra subprograms operating on vectors and matrices. |