Skip to content

Commit dff68cf

Browse files
committed
Update primitiv-core
1 parent c71107c commit dff68cf

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

.travis/debian.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker run --name travis-ci -v $TRAVIS_BUILD_DIR:/primitiv-python -td debian:sta
77

88
# install
99
docker exec travis-ci bash -c "apt update"
10-
docker exec travis-ci bash -c "apt install -y git build-essential cmake python3-dev python3-pip python3-numpy"
10+
docker exec travis-ci bash -c "apt install -y build-essential cmake python3-dev python3-pip python3-numpy"
1111
docker exec travis-ci bash -c "pip3 install cython scikit-build"
1212

1313
# TODO(vbkaisetsu):
@@ -17,14 +17,20 @@ docker exec travis-ci bash -c "pip3 install cython scikit-build"
1717
# For more details, see: http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1392
1818

1919
# install Eigen
20-
docker exec travis-ci bash -c "apt install -y mercurial"
21-
docker exec travis-ci bash -c "hg clone https://bitbucket.org/eigen/eigen"
20+
docker exec travis-ci bash -c "apt install -y wget"
21+
docker exec travis-ci bash -c "wget http://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2 -O ./eigen.tar.bz2"
22+
docker exec travis-ci bash -c "mkdir ./eigen"
23+
docker exec travis-ci bash -c "tar xf ./eigen.tar.bz2 -C ./eigen --strip-components 1"
2224
docker exec travis-ci bash -c "mkdir ./eigen/build"
2325
docker exec travis-ci bash -c "cd ./eigen/build && cmake .."
2426
docker exec travis-ci bash -c "cd ./eigen/build && make && make install"
2527

2628
# install OpenCL environment
27-
docker exec travis-ci bash -c "apt install -y opencl-headers libclblas-dev pkg-config libhwloc-dev libltdl-dev ocl-icd-dev ocl-icd-opencl-dev clang-3.8 llvm-3.8-dev libclang-3.8-dev libz-dev"
29+
docker exec travis-ci bash -c "apt install -y opencl-headers git pkg-config libhwloc-dev libltdl-dev ocl-icd-dev ocl-icd-opencl-dev clang-3.8 llvm-3.8-dev libclang-3.8-dev libz-dev"
30+
docker exec travis-ci bash -c "wget https://github.com/CNugteren/CLBlast/archive/1.2.0.tar.gz -O ./clblast.tar.gz"
31+
docker exec travis-ci bash -c "mkdir ./clblast"
32+
docker exec travis-ci bash -c "tar xf ./clblast.tar.gz -C ./clblast --strip-components 1"
33+
docker exec travis-ci bash -c "cd ./clblast && cmake . && make && make install"
2834
# pocl 0.13 does not contain mem_fence() function that is used by primitiv.
2935
# We build the latest pocl instead of using distribution's package.
3036
# See: https://github.com/pocl/pocl/issues/294

.travis/fedora.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker run --name travis-ci -v $TRAVIS_BUILD_DIR:/primitiv-python -td fedora:lat
77

88
# install
99
docker exec travis-ci bash -c "dnf update -y"
10-
docker exec travis-ci bash -c "dnf install -y git rpm-build gcc-c++ cmake make python3-devel python3-numpy eigen3-devel"
10+
docker exec travis-ci bash -c "dnf install -y rpm-build gcc-c++ cmake make python3-devel python3-numpy eigen3-devel"
1111
docker exec travis-ci bash -c "pip3 install cython scikit-build"
1212

1313
# NOTE(vbkaisetsu):

.travis/ubuntu.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ docker run --name travis-ci -v $TRAVIS_BUILD_DIR:/primitiv-python -td ubuntu:rol
77

88
# install
99
docker exec travis-ci bash -c "apt update"
10-
docker exec travis-ci bash -c "apt install -y git build-essential cmake python3-dev python3-pip python3-numpy libeigen3-dev"
10+
docker exec travis-ci bash -c "apt install -y build-essential cmake python3-dev python3-pip python3-numpy libeigen3-dev"
1111
docker exec travis-ci bash -c "pip3 install cython scikit-build"
1212

1313
# install OpenCL environment
14-
docker exec travis-ci bash -c "apt install -y opencl-headers libclblas-dev pkg-config libhwloc-dev libltdl-dev ocl-icd-dev ocl-icd-opencl-dev clang llvm-dev libclang-dev libz-dev"
14+
docker exec travis-ci bash -c "apt install -y opencl-headers git wget pkg-config libhwloc-dev libltdl-dev ocl-icd-dev ocl-icd-opencl-dev clang llvm-dev libclang-dev libz-dev"
15+
docker exec travis-ci bash -c "wget https://github.com/CNugteren/CLBlast/archive/1.2.0.tar.gz -O ./clblast.tar.gz"
16+
docker exec travis-ci bash -c "mkdir ./clblast"
17+
docker exec travis-ci bash -c "tar xf ./clblast.tar.gz -C ./clblast --strip-components 1"
18+
docker exec travis-ci bash -c "cd ./clblast && cmake . && make && make install"
1519
# pocl 0.13 does not contain mem_fence() function that is used by primitiv.
1620
# We build the latest pocl instead of using distribution's package.
1721
# See: https://github.com/pocl/pocl/issues/294

primitiv-core

Submodule primitiv-core updated 101 files

0 commit comments

Comments
 (0)