Skip to content

Commit 5aa7d50

Browse files
ZialusZialus
authored
Add windows, simplify the rest.
1 parent 945e564 commit 5aa7d50

File tree

1 file changed

+37
-34
lines changed

1 file changed

+37
-34
lines changed

‎.travis.yml

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ matrix:
4141
addons:
4242
apt:
4343
packages: &xenial_packages
44-
- g++-7
4544
# POCL
4645
- libltdl-dev
4746
- libhwloc-dev
@@ -61,8 +60,6 @@ matrix:
6160
- lcov
6261
- libopencv-dev
6362
- clinfo
64-
sources: &xenial_sources
65-
- ubuntu-toolchain-r-test
6663
env:
6764
- OPENCL_LIB=pocl
6865
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=100"
@@ -73,7 +70,6 @@ matrix:
7370
addons:
7471
apt:
7572
packages: *xenial_packages
76-
sources: *xenial_sources
7773
env:
7874
- OPENCL_LIB=pocl
7975
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=100"
@@ -85,7 +81,6 @@ matrix:
8581
addons:
8682
apt:
8783
packages: *xenial_packages
88-
sources: *xenial_sources
8984
env:
9085
- OPENCL_LIB=pocl
9186
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=101"
@@ -96,7 +91,6 @@ matrix:
9691
addons:
9792
apt:
9893
packages: *xenial_packages
99-
sources: *xenial_sources
10094
env:
10195
- OPENCL_LIB=pocl
10296
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=101"
@@ -108,7 +102,6 @@ matrix:
108102
addons:
109103
apt:
110104
packages: *xenial_packages
111-
sources: *xenial_sources
112105
env:
113106
- OPENCL_LIB=pocl
114107
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102"
@@ -119,61 +112,56 @@ matrix:
119112
addons:
120113
apt:
121114
packages: *xenial_packages
122-
sources: *xenial_sources
123115
env:
124116
- OPENCL_LIB=pocl
125117
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102"
126118
- ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
127-
# Linux, OpenCL 2.0
119+
120+
############################################################################
121+
# Intel OpenCL Runtime builds
122+
############################################################################
123+
124+
# Linux, Intel OpenCL 1.2
128125
# CLANG
129126
- os: linux
130127
compiler: clang
131128
addons:
132129
apt:
133130
packages: *xenial_packages
134-
sources: *xenial_sources
135131
env:
136-
- OPENCL_LIB=pocl
137-
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=200"
138-
- ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
132+
- OPENCL_LIB=intel
133+
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102"
134+
- ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
139135
# GCC
140136
- os: linux
141137
compiler: gcc
142138
addons:
143139
apt:
144140
packages: *xenial_packages
145-
sources: *xenial_sources
146141
env:
147-
- OPENCL_LIB=pocl
148-
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=200"
149-
- ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${POCL_OPENCL_LIB} -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
150-
151-
############################################################################
152-
# Intel OpenCL Runtime builds
153-
############################################################################
154-
155-
# Linux, Intel OpenCL 1.2
142+
- OPENCL_LIB=intel
143+
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102"
144+
- ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
145+
# Linux, Intel OpenCL 2.0
156146
# CLANG
157147
- os: linux
158148
compiler: clang
159149
addons:
160150
apt:
161151
packages: *xenial_packages
162-
sources: *xenial_sources
163152
env:
164153
- OPENCL_LIB=intel
165-
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102"
154+
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=200"
166155
- ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
167156
# GCC
168157
- os: linux
169158
compiler: gcc
170159
addons:
171160
apt:
172161
packages: *xenial_packages
173-
sources: *xenial_sources
174162
env:
175163
- OPENCL_LIB=intel
176-
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=102"
164+
- ENV_CXX_FLAGS="-Wno-unused-local-typedef -DBOOST_COMPUTE_MAX_CL_VERSION=200"
177165
- ENV_CMAKE_OPTIONS="-DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include"
178166
# Linux, Intel OpenCL 2.1
179167
# CLANG
@@ -186,13 +174,11 @@ matrix:
186174
addons:
187175
apt:
188176
packages: &xenial_intel_latest_boost_packages
189-
- g++-7
190177
# Misc
191178
- python-yaml
192179
- lcov
193180
- libopencv-dev
194-
sources: &xenial_intel_latest_boost_sources
195-
- ubuntu-toolchain-r-test
181+
- clinfo
196182
env:
197183
- OPENCL_LIB=intel
198184
- BOOST_VERSION="1_69_0" # Boost 1.69.0
@@ -208,7 +194,6 @@ matrix:
208194
addons:
209195
apt:
210196
packages: *xenial_intel_latest_boost_packages
211-
sources: *xenial_intel_latest_boost_sources
212197
env:
213198
- OPENCL_LIB=intel
214199
- BOOST_VERSION="1_69_0" # Boost 1.69.0
@@ -227,7 +212,6 @@ matrix:
227212
compiler: clang
228213
env:
229214
- ENV_CXX_FLAGS="-Wno-c99-extensions"
230-
- ENV_CMAKE_OPTIONS="-DBOOST_COMPUTE_HAVE_OPENCV=OFF"
231215
- MATRIX_EVAL="CC=clang && CXX=clang++ && export PATH=\"/usr/local/opt/llvm/bin:$PATH\" && export LDFLAGS=\"-L/usr/local/opt/llvm/lib\" && export CPPFLAGS=\"-I/usr/local/opt/llvm/include\""
232216
addons:
233217
homebrew:
@@ -237,18 +221,37 @@ matrix:
237221
- lcov
238222
- gcc@5
239223
- llvm
224+
- opencv
240225
# GCC
241226
- os: osx
242227
osx_image: xcode10
243228
compiler: gcc
244229
env:
245230
- ENV_CXX_FLAGS="-Wno-c99-extensions"
246-
- ENV_CMAKE_OPTIONS="-DBOOST_COMPUTE_HAVE_OPENCV=OFF"
247231
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
248232
addons:
249233
homebrew:
250234
packages: *osx_packages
251235

236+
############################################################################
237+
# Windows
238+
############################################################################
239+
- os: windows
240+
env:
241+
- ENV_CXX_FLAGS="-DBOOST_COMPUTE_MAX_CL_VERSION=200"
242+
- NUGETDIR="C:/NUGET"
243+
- OCL_ROOT="$NUGETDIR/opencl-nug.0.777.77/build/native"
244+
install:
245+
# Install OpenCL headers and libraries
246+
- choco install nuget.commandline
247+
- nuget install opencl-nug -Version 0.777.77 -OutputDirectory $NUGETDIR
248+
- ls -l $NUGETDIR/opencl-nug.0.777.77/build/native/
249+
# Install OpenCL Runtime
250+
- choco install opencl-intel-cpu-runtime
251+
# Check if it's working
252+
- curl -L 'https://ci.appveyor.com/api/projects/oblomov/clinfo/artifacts/clinfo.exe?job=platform:+x64' -o clinfo.exe
253+
- ./clinfo.exe
254+
252255
cache:
253256
directories:
254257
- ${DEPS_DIR}/llvm-${POCL_LLVM_VERSION}
@@ -365,7 +368,7 @@ script:
365368
- echo ${CMAKE_OPTIONS}
366369
- echo ${CXX_FLAGS}
367370
- cmake ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ..
368-
- make -j4
371+
- cmake --build . --config Debug -j 4
369372
- |
370373
if [[ ${RUN_TESTS} == "true" ]]; then
371374
# print OpenCL devices

0 commit comments

Comments
 (0)