Skip to content

Commit 24a4d7a

Browse files
author
Joe Petviashvili
committed
Merge branch 'gaika-master'
2 parents f6dd3f3 + 1b1bd74 commit 24a4d7a

Some content is hidden

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

56 files changed

+4233
-5677
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.jl.cov
22
*.jl.mem
3+
*~

.travis.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
1+
dist: trusty
2+
sudo: required
13
language: julia
24
os:
35
- linux
46
julia:
5-
- 0.4
67
- 0.5
8+
- 0.6
9+
# - nightly
710
notifications:
811
email: false
912
install:
1013
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
14+
# - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x24"
15+
# - "export DISPLAY=:99.0"
16+
- sudo apt-add-repository -y ppa:keithw/glfw3
1117
- sudo apt-get update
12-
- sudo apt-get install libfreeimage-dev libatlas3gf-base libfftw3-dev cmake
13-
- wget http://ci.arrayfire.org/userContent/Linux/ArrayFire-no-gl-v3.4.2_Linux_x86_64.sh
18+
- sudo apt-get install libfreeimage-dev libatlas3gf-base libfftw3-dev cmake libglfw3-dev mesa-utils
19+
- wget http://ci.arrayfire.org/job/arrayfire-linux/job/graphics-installer/lastSuccessfulBuild/artifact/ArrayFire-v3.5.1_Linux_x86_64.sh
1420
- ls -l
15-
- sudo chmod +x ArrayFire-no-gl-v3.4.2_Linux_x86_64.sh
16-
- sudo ./ArrayFire-no-gl-v3.4.2_Linux_x86_64.sh --exclude-subdir --prefix=/usr/local
21+
- sudo chmod +x ArrayFire-v3.5.1_Linux_x86_64.sh
22+
- sudo ./ArrayFire-v3.5.1_Linux_x86_64.sh --exclude-subdir --prefix=/usr/local
1723
before_script:
1824
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
19-
25+
- julia -e 'Pkg.add("AutoDiffSource"); Pkg.checkout("AutoDiffSource");'
26+
after_success:
27+
# push coverage results to Coveralls
28+
- julia -e 'cd(Pkg.dir("ArrayFire")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
29+
# push coverage results to Codecov
30+
- julia -e 'cd(Pkg.dir("ArrayFire")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

LICENSE.md

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,52 @@
1-
Copyright (c) 2015, Julia Computing Inc.
2-
All rights reserved.
1+
The ArrayFire.jl package is licensed under the MIT "Expat" License:
32

4-
Redistribution and use in source and binary forms, with or without modification,
5-
are permitted provided that the following conditions are met:
3+
> Copyright (c) 2016: Joe Petviashvili.
4+
>
5+
> Permission is hereby granted, free of charge, to any person obtaining a copy
6+
> of this software and associated documentation files (the "Software"), to deal
7+
> in the Software without restriction, including without limitation the rights
8+
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
> copies of the Software, and to permit persons to whom the Software is
10+
> furnished to do so, subject to the following conditions:
11+
>
12+
> The above copyright notice and this permission notice shall be included in all
13+
> copies or substantial portions of the Software.
14+
>
15+
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
> SOFTWARE.
22+
>
623
7-
* Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
24+
Rewrite from scratch, original package by Julia Computing Inc:
925

10-
* Redistributions in binary form must reproduce the above copyright notice, this
11-
list of conditions and the following disclaimer in the documentation and/or
12-
other materials provided with the distribution.
13-
14-
* Neither the name of the ArrayFire nor the names of its
15-
contributors may be used to endorse or promote products derived from
16-
this software without specific prior written permission.
17-
18-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
22-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26+
> Copyright (c) 2015, Julia Computing Inc.
27+
> All rights reserved.
28+
>
29+
> Redistribution and use in source and binary forms, with or without modification,
30+
> are permitted provided that the following conditions are met:
31+
>
32+
> * Redistributions of source code must retain the above copyright notice, this
33+
> list of conditions and the following disclaimer.
34+
>
35+
> * Redistributions in binary form must reproduce the above copyright notice, this
36+
> list of conditions and the following disclaimer in the documentation and/or
37+
> other materials provided with the distribution.
38+
>
39+
> * Neither the name of the ArrayFire nor the names of its
40+
> contributors may be used to endorse or promote products derived from
41+
> this software without specific prior written permission.
42+
>
43+
> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
44+
> ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
45+
> WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46+
> DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
47+
> ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
48+
> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
49+
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
50+
> ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
51+
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
52+
> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)