Skip to content

Commit db15b40

Browse files
breyermlbreyerml
authored
Merge pull request #14 from SC-SGS/develop
Update main
2 parents 9548b19 + 5b2706c commit db15b40

36 files changed

+1551
-533
lines changed

‎.jenkins/Jenkinsfile-multigpu-tests‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pipeline {
148148
source /scratch/jenkins/spack/share/spack/setup-env.sh && spack load cmake@3.20.2 &&\
149149
module load cuda/11.2.2 &&\
150150
module use /home/breyerml/.modulefiles/ &&\
151-
module load pcsgs05/hipsycl_20_11_16 &&\
151+
module load plssvm/argon-gtx/hipsycl &&\
152152
mkdir -p build/Release_hip &&\
153153
cd build/Release_hip &&\
154154
rm -rf * &&\
@@ -166,7 +166,7 @@ pipeline {
166166
srun -w argon-gtx -N 1 -n 1 -t 01:00:00 -D /scratch/jenkins/plssvm/${BUILD_TAG}/PLSSVM --gres=gpu:2 bash -c "\
167167
module load cuda/11.2.2 &&\
168168
module use /home/breyerml/.modulefiles/ &&\
169-
module load pcsgs05/hipsycl_20_11_16 &&\
169+
module load plssvm/argon-gtx/hipsycl &&\
170170
cd build/Release_hip &&\
171171
ctest -j4 --no-compress-output -T Test --timeout 1200; \
172172
returncode=$? && \
@@ -189,11 +189,11 @@ pipeline {
189189
source /scratch/jenkins/spack/share/spack/setup-env.sh && spack load cmake@3.20.2 &&\
190190
module load cuda/11.2.2 &&\
191191
module use /home/breyerml/.modulefiles/ &&\
192-
module load pcsgs05/dpcpp_2022_01_18 &&\
192+
module load plssvm/argon-gtx/dpcpp &&\
193193
mkdir -p build/Release_dpcpp &&\
194194
cd build/Release_dpcpp &&\
195195
rm -rf * &&\
196-
cmake -DCMAKE_BUILD_TYPE=Release -DPLSSVM_TARGET_PLATFORMS='cpu;nvidia:sm_61' -DCMAKE_CXX_COMPILER=clang++ -DPLSSVM_ENABLE_OPENMP_BACKEND=OFF -DPLSSVM_ENABLE_CUDA_BACKEND=ON -DPLSSVM_ENABLE_OPENCL_BACKEND=OFF -DPLSSVM_ENABLE_SYCL_BACKEND=ON -DPLSSVM_ENABLE_ASSERTS=ON -DPLSSVM_ENABLE_LTO=OFF -S ../../ &&\
196+
cmake -DCMAKE_BUILD_TYPE=Release -DPLSSVM_TARGET_PLATFORMS='nvidia:sm_61' -DCMAKE_CXX_COMPILER=clang++ -DPLSSVM_ENABLE_OPENMP_BACKEND=OFF -DPLSSVM_ENABLE_CUDA_BACKEND=ON -DPLSSVM_ENABLE_OPENCL_BACKEND=OFF -DPLSSVM_ENABLE_SYCL_BACKEND=ON -DPLSSVM_ENABLE_ASSERTS=ON -DPLSSVM_ENABLE_LTO=OFF -S ../../ &&\
197197
make -j4 "
198198
'''
199199
}
@@ -207,7 +207,7 @@ pipeline {
207207
srun -w argon-gtx -N 1 -n 1 -t 01:00:00 -D /scratch/jenkins/plssvm/${BUILD_TAG}/PLSSVM --gres=gpu:2 bash -c "\
208208
module load cuda/11.2.2 &&\
209209
module use /home/breyerml/.modulefiles/ &&\
210-
module load pcsgs05/dpcpp_2022_01_18 &&\
210+
module load plssvm/argon-gtx/dpcpp &&\
211211
cd build/Release_dpcpp &&\
212212
ctest -j4 --no-compress-output -T Test --timeout 1200; \
213213
returncode=$? && \

‎.jenkins/Jenkinsfile-tests‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ pipeline {
112112
steps {
113113
dir('plssvm') {
114114
sh '''
115-
module load cuda/11.2.2
116115
module use /home/breyerml/.modulefiles/
117-
module load pcsgs05/hipsycl_20_11_16
116+
module load network_hipsycl_cuda
118117
mkdir -p build/Release_hip
119118
cd build/Release_hip
120119
rm -rf *
@@ -129,9 +128,8 @@ pipeline {
129128
dir('plssvm') {
130129
warnError('hipSYCL Release tests failed!') {
131130
sh '''
132-
module load cuda/11.2.2
133131
module use /home/breyerml/.modulefiles/
134-
module load pcsgs05/hipsycl_20_11_16
132+
module load network_hipsycl_cuda
135133
cd build/Release_hip
136134
ctest -j4 --no-compress-output -T Test
137135
'''
@@ -143,13 +141,12 @@ pipeline {
143141
steps {
144142
dir('plssvm') {
145143
sh '''
146-
module load cuda/11.2.2
147144
module use /home/breyerml/.modulefiles/
148-
module load pcsgs05/dpcpp_2022_01_18
145+
module load network_dpcpp_cuda
149146
mkdir -p build/Release_dpcpp
150147
cd build/Release_dpcpp
151148
rm -rf *
152-
/import/sgs.scratch/vancraar/spack/opt/spack/linux-ubuntu20.04-cascadelake/clang-12.0.0/cmake-3.20.2-z3urlvzqm5igtwxj25nnd5olciuq7ayb/bin/cmake -DCMAKE_BUILD_TYPE=Release -DPLSSVM_TARGET_PLATFORMS="cpu;nvidia:sm_80" -DCMAKE_CXX_COMPILER=clang++ -DPLSSVM_ENABLE_OPENMP_BACKEND=OFF -DPLSSVM_ENABLE_CUDA_BACKEND=ON -DPLSSVM_ENABLE_OPENCL_BACKEND=OFF -DPLSSVM_ENABLE_SYCL_BACKEND=ON -DPLSSVM_ENABLE_ASSERTS=ON ../../
149+
/import/sgs.scratch/vancraar/spack/opt/spack/linux-ubuntu20.04-cascadelake/clang-12.0.0/cmake-3.20.2-z3urlvzqm5igtwxj25nnd5olciuq7ayb/bin/cmake -DCMAKE_BUILD_TYPE=Release -DPLSSVM_TARGET_PLATFORMS="nvidia:sm_80" -DCMAKE_CXX_COMPILER=clang++ -DPLSSVM_ENABLE_OPENMP_BACKEND=OFF -DPLSSVM_ENABLE_CUDA_BACKEND=ON -DPLSSVM_ENABLE_OPENCL_BACKEND=OFF -DPLSSVM_ENABLE_SYCL_BACKEND=ON -DPLSSVM_ENABLE_ASSERTS=ON ../../
153150
make -j4
154151
'''
155152
}
@@ -160,9 +157,8 @@ pipeline {
160157
dir('plssvm') {
161158
warnError('DPC++ Release tests failed!') {
162159
sh '''
163-
module load cuda/11.2.2
164160
module use /home/breyerml/.modulefiles/
165-
module load pcsgs05/dpcpp_2022_01_18
161+
module load network_dpcpp_cuda
166162
cd build/Release_dpcpp
167163
ctest -j4 --no-compress-output -T Test
168164
'''
@@ -191,9 +187,8 @@ pipeline {
191187
steps {
192188
dir('plssvm') {
193189
sh '''
194-
module load cuda/11.2.2
195190
module use /home/breyerml/.modulefiles/
196-
module load pcsgs05/hipsycl_20_11_16
191+
module load network_hipsycl_cuda
197192
mkdir -p build/Debug_hip
198193
cd build/Debug_hip
199194
rm -rf *
@@ -203,22 +198,23 @@ pipeline {
203198
}
204199
}
205200
}
201+
/*
206202
stage('build plssvm DPC++ Debug') {
207203
steps {
208204
dir('plssvm') {
209205
sh '''
210-
module load cuda/11.2.2
211206
module use /home/breyerml/.modulefiles/
212-
module load pcsgs05/dpcpp_2022_01_18
207+
module load network_dpcpp_cuda
213208
mkdir -p build/Debug_dpcpp
214209
cd build/Debug_dpcpp
215210
rm -rf *
216-
/import/sgs.scratch/vancraar/spack/opt/spack/linux-ubuntu20.04-cascadelake/clang-12.0.0/cmake-3.20.2-z3urlvzqm5igtwxj25nnd5olciuq7ayb/bin/cmake -DCMAKE_BUILD_TYPE=Debug -DPLSSVM_TARGET_PLATFORMS="cpu;nvidia:sm_80" -DCMAKE_CXX_COMPILER=clang++ -DPLSSVM_ENABLE_OPENMP_BACKEND=OFF -DPLSSVM_ENABLE_CUDA_BACKEND=ON -DPLSSVM_ENABLE_OPENCL_BACKEND=OFF -DPLSSVM_ENABLE_SYCL_BACKEND=ON ../../
211+
/import/sgs.scratch/vancraar/spack/opt/spack/linux-ubuntu20.04-cascadelake/clang-12.0.0/cmake-3.20.2-z3urlvzqm5igtwxj25nnd5olciuq7ayb/bin/cmake -DCMAKE_BUILD_TYPE=Debug -DPLSSVM_TARGET_PLATFORMS="nvidia:sm_80" -DCMAKE_CXX_COMPILER=clang++ -DPLSSVM_ENABLE_OPENMP_BACKEND=OFF -DPLSSVM_ENABLE_CUDA_BACKEND=ON -DPLSSVM_ENABLE_OPENCL_BACKEND=OFF -DPLSSVM_ENABLE_SYCL_BACKEND=ON ../../
217212
make -j4
218213
'''
219214
}
220215
}
221216
}
217+
*/
222218
}
223219
post {
224220
always {

‎CMakeLists.txt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
cmake_minimum_required(VERSION 3.18)
88

9-
project("PLSSVM - Parallel Least-Squares Support Vector Machine"
10-
VERSION 1.0.1
9+
project("PLSSVM - Parallel Least Squares Support Vector Machine"
10+
VERSION 1.1.0
1111
LANGUAGES CXX
12-
DESCRIPTION "A Support Vector Machine implementation using different backends.")
12+
DESCRIPTION "A Least Squares Support Vector Machine implementation using different backends.")
1313

1414

1515
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/add_custom_build_type.cmake)
@@ -39,6 +39,7 @@ set(PLSSVM_BASE_SOURCES
3939
${CMAKE_CURRENT_SOURCE_DIR}/src/plssvm/parameter_predict.cpp
4040
${CMAKE_CURRENT_SOURCE_DIR}/src/plssvm/parameter_train.cpp
4141
${CMAKE_CURRENT_SOURCE_DIR}/src/plssvm/target_platforms.cpp
42+
${CMAKE_CURRENT_LIST_DIR}/src/plssvm/backends/SYCL/kernel_invocation_type.cpp
4243
)
4344

4445
## create base library: linked against all backend libraries
@@ -255,28 +256,29 @@ foreach(PLSSVM_PLATFORM ${PLSSVM_TARGET_PLATFORMS})
255256
if(PLSSVM_PLATFORM MATCHES "^cpu")
256257
# parse provided CPU architectures
257258
parse_architecture_info(${PLSSVM_PLATFORM} PLSSVM_CPU_TARGET_ARCHS PLSSVM_NUM_CPU_TARGET_ARCHS)
258-
if(NOT PLSSVM_NUM_CPU_TARGET_ARCHS EQUAL 0)
259-
message(FATAL_ERROR "Target platform \"cpu\" must not have any architecture specifications!")
259+
if(PLSSVM_NUM_CPU_TARGET_ARCHS GREATER 1)
260+
message(FATAL_ERROR "Target platform \"cpu\" must at most have one architecture specification!")
260261
endif()
261262
target_compile_definitions(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC PLSSVM_HAS_CPU_TARGET)
262263
elseif(PLSSVM_PLATFORM MATCHES "^nvidia")
263264
# parse provided NVIDIA GPU architectures
264265
parse_architecture_info(${PLSSVM_PLATFORM} PLSSVM_NVIDIA_TARGET_ARCHS PLSSVM_NUM_NVIDIA_TARGET_ARCHS)
265266
if(PLSSVM_NUM_NVIDIA_TARGET_ARCHS EQUAL 0)
266-
message(FATAL_ERROR "Target platform \"nvidia\" must at least have one architecture specifications!")
267+
message(FATAL_ERROR "Target platform \"nvidia\" must at least have one architecture specification!")
267268
endif()
268269
target_compile_definitions(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC PLSSVM_HAS_NVIDIA_TARGET)
269270
elseif(PLSSVM_PLATFORM MATCHES "^amd")
270271
# parse provided AMD GPU architectures
271272
parse_architecture_info(${PLSSVM_PLATFORM} PLSSVM_AMD_TARGET_ARCHS PLSSVM_NUM_AMD_TARGET_ARCHS)
272273
if(PLSSVM_NUM_AMD_TARGET_ARCHS EQUAL 0)
273-
message(FATAL_ERROR "Target platform \"amd\" must at least have one architecture specifications!")
274+
message(FATAL_ERROR "Target platform \"amd\" must at least have one architecture specification!")
274275
endif()
275276
target_compile_definitions(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC PLSSVM_HAS_AMD_TARGET)
276277
elseif(PLSSVM_PLATFORM MATCHES "^intel")
278+
# parse provided Intel GPU architectures
277279
parse_architecture_info(${PLSSVM_PLATFORM} PLSSVM_INTEL_TARGET_ARCHS PLSSVM_NUM_INTEL_TARGET_ARCHS)
278-
if(NOT PLSSVM_NUM_INTEL_TARGET_ARCHS EQUAL 0)
279-
message(FATAL_ERROR "Target platform \"intel\" must not have any architecture specifications!")
280+
if(PLSSVM_NUM_INTEL_TARGET_ARCHS EQUAL 0)
281+
message(FATAL_ERROR "Target platform \"intel\" must at least have one architecture specification!")
280282
endif()
281283
target_compile_definitions(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC PLSSVM_HAS_INTEL_TARGET)
282284
else()

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MIT License
1+
# MIT License
22

33
Copyright (c) 2021 Alexander Van Craen and Marcel Breyer @ University of Stuttgart
44

0 commit comments

Comments
 (0)