Skip to content

Commit

Permalink
Merge pull request #34 from JuliaGPU/sd/osx
Browse files Browse the repository at this point in the history
try homebrew for binary
  • Loading branch information
SimonDanisch authored Aug 16, 2017
2 parents dc55702 + c13ef86 commit 5356f06
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ deps/deps.jl
deps/downloads
deps/package
deps/clBLAS-2.12.0-Linux-x64
*.jl.mem
23 changes: 9 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
language: julia
sudo: false

os:
- linux
- osx

julia:
- 0.5

env:
- CLBLAS=2.6 PATCH=0
- CLBLAS=2.8 PATCH=0
- 0.6
- nightly
matrix:
allow_failures:
- julia: nightly

notifications:
email: false

sudo: false

git:
depth: 9999999

before_install:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- if [ $TRAVIS_OS_NAME = "linux" ]; then
Expand All @@ -29,9 +27,6 @@ before_install:
sh AMD-APP-SDK*.sh --tar -xf -C ${AMDAPPSDK};
echo libamdocl64.so > ${OPENCL_VENDOR_PATH}/amdocl64.icd;
export LD_LIBRARY_PATH=${AMDAPPSDK}/lib/x86_64:${LD_LIBRARY_PATH};
fi;
- if [ $TRAVIS_OS_NAME = "linux" ]; then
wget https://github.com/clMathLibraries/clBLAS/releases/download/v${CLBLAS}/clBLAS-${CLBLAS}.${PATCH}-Linux-x64.tar.gz;
tar -xf clBLAS-${CLBLAS}.${PATCH}-Linux-x64.tar.gz;
export LD_LIBRARY_PATH=${HOME}/build/JuliaGPU/CLBLAS.jl/clBLAS-${CLBLAS}.${PATCH}-Linux-x64/lib64:${LD_LIBRARY_PATH};
chmod +x ${AMDAPPSDK}/bin/x86_64/clinfo;
${AMDAPPSDK}/bin/x86_64/clinfo;
fi;
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
julia 0.5
OpenCL 0.5
BinDeps
@osx Homebrew
6 changes: 2 additions & 4 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ if is_linux()
end

if is_apple()
error("""
OSX not oficially supported.
Find manual build instructions on: https://github.com/clMathLibraries/clBLAS/wiki/Build
""")
using Homebrew
provides(Homebrew.HB, "homebrew/science/clblas", libCLBLAS, os = :Darwin)
end

@BinDeps.install Dict("libCLBLAS" => "libCLBLAS")
Expand Down
1 change: 1 addition & 0 deletions src/CLBLAS.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
__precompile__(true)
module CLBLAS

using OpenCL: cl
Expand Down

0 comments on commit 5356f06

Please sign in to comment.