Skip to content

Commit 1ab0611

Browse files
breyermlbreyerml
authored
Merge pull request #26 from SC-SGS/auto_generated
autogenerated
2 parents 15e1cb8 + 96c38a9 commit 1ab0611

File tree

20 files changed

+85
-68
lines changed

20 files changed

+85
-68
lines changed

‎.gitignore‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,16 @@ CTestTestfile.cmake
5656

5757
# Project related ================================
5858

59-
# configured SYCL implementation files
60-
include/plssvm/backends/DPCPP/*
61-
include/plssvm/backends/hipSYCL/*
62-
src/plssvm/backends/DPCPP/*
63-
src/plssvm/backends/hipSYCL/*
64-
tests/backends/SYCL/DPCPP/*
65-
tests/backends/SYCL/hipSYCL/*
59+
# ignore everything in the autogenerated folder, except the README
60+
include/plssvm/backends/autogenerated/*
61+
!include/plssvm/backends/autogenerated/README.md
62+
src/plssvm/backends/autogenerated/*
63+
!src/plssvm/backends/autogenerated/README.md
64+
tests/backends/autogenerated/*
65+
!tests/backends/autogenerated/README.md
66+
67+
# auto-generated version header
68+
include/plssvm/version/version.hpp
6669

6770
# generated documentation
6871
!docs/
@@ -72,11 +75,6 @@ docs/*
7275
!docs/plssvm-train.1.in
7376
!docs/plssvm-predict.1.in
7477

75-
# auto-generated version header
76-
include/plssvm/version/version.hpp
77-
# auto-generated OpenCL kernel_src_string
78-
include/plssvm/backends/OpenCL/detail/kernel_source_string.hpp
79-
8078
# data in test folder
8179
!tests/data/
8280
tests/data/*

‎include/plssvm/backends/SYCL/csvm.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
#pragma once
1313

14-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // forward declaration and namespace alias
15-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/device_ptr.hpp" // plssvm::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::detail::device_ptr
16-
#include "plssvm/backends/SYCL/kernel_invocation_type.hpp" // plssvm::sycl_generic::kernel_invocation_type
17-
#include "plssvm/backends/gpu_csvm.hpp" // plssvm::detail::gpu_csvm
14+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // forward declaration and namespace alias
15+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/device_ptr.hpp" // plssvm::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::detail::device_ptr
16+
#include "plssvm/backends/SYCL/kernel_invocation_type.hpp" // plssvm::sycl_generic::kernel_invocation_type
17+
#include "plssvm/backends/gpu_csvm.hpp" // plssvm::detail::gpu_csvm
1818

1919
#include <memory> // std::unique_ptr
2020

‎include/plssvm/backends/SYCL/detail/device_ptr.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#pragma once
1313

14-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // forward declaration and namespace alias
15-
#include "plssvm/backends/gpu_device_ptr.hpp" // plssvm::detail::gpu_device_ptr
14+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // forward declaration and namespace alias
15+
#include "plssvm/backends/gpu_device_ptr.hpp" // plssvm::detail::gpu_device_ptr
1616

1717
#include "sycl/sycl.hpp" // sycl::queue
1818

‎include/plssvm/backends/SYCL/detail/utility.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#pragma once
1313

14-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // forward declaration and namespace alias
15-
#include "plssvm/target_platforms.hpp" // plssvm::target_platform
14+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // forward declaration and namespace alias
15+
#include "plssvm/target_platforms.hpp" // plssvm::target_platform
1616

1717
#include <memory> // std::unique_ptr
1818
#include <utility> // std::pair

‎include/plssvm/backends/autogenerated/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# 'autogenerated' directory
2+
3+
Since this directory only contains autogenerated files, these files **must not** be changed manually!
4+
5+
If you want to change the content of the `OpenCL/detail/kernel_source_string.hpp` file, have a look the the
6+
`*.cl` kernels inside the main `include/plssvm/backends/OpenCL/` directory.
7+
8+
If you want to change the content of any file inside the `DPCPP` or `hipSYLC` directories, have a look at the
9+
files inside the main `include/plssvm/backends/SYCL` directory.

‎include/plssvm/csvm_factory.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
#endif
3434
#if defined(PLSSVM_HAS_SYCL_BACKEND)
3535
#if defined(PLSSVM_SYCL_BACKEND_HAS_DPCPP)
36-
#include "plssvm/backends/DPCPP/csvm.hpp" // plssvm::dpcpp::csvm
36+
#include "plssvm/backends/autogenerated/DPCPP/csvm.hpp" // plssvm::dpcpp::csvm
3737
#endif
3838
#if defined(PLSSVM_SYCL_BACKEND_HAS_HIPSYCL)
39-
#include "plssvm/backends/hipSYCL/csvm.hpp" // plssvm::hipsycl::csvm
39+
#include "plssvm/backends/autogenerated/hipSYCL/csvm.hpp" // plssvm::hipsycl::csvm
4040
#endif
4141
#endif
4242

‎src/plssvm/backends/OpenCL/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ string(APPEND PLSSVM_OPENCL_KERNEL_SOURCE_STRING "// ${OpenCL_LIBRARY}")
6464
# configure string with the assembled kernel sources
6565
message(STATUS "Generating the OpenCL kernel source string.")
6666
configure_file("${PROJECT_SOURCE_DIR}/include/plssvm/backends/OpenCL/detail/kernel_source_string.hpp.in"
67-
"${PROJECT_SOURCE_DIR}/include/plssvm/backends/OpenCL/detail/kernel_source_string.hpp" @ONLY)
67+
"${PROJECT_SOURCE_DIR}/include/plssvm/backends/autogenerated/OpenCL/detail/kernel_source_string.hpp" @ONLY)
6868

6969
# set OpenCL target version
7070
target_compile_definitions(${PLSSVM_BASE_LIBRARY_NAME} PUBLIC CL_TARGET_OPENCL_VERSION=220)

‎src/plssvm/backends/OpenCL/detail/utility.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88

99
#include "plssvm/backends/OpenCL/detail/utility.hpp"
1010

11-
#include "plssvm/backends/OpenCL/detail/command_queue.hpp" // plssvm::opencl::detail::command_queue
12-
#include "plssvm/backends/OpenCL/detail/context.hpp" // plssvm::opencl::detail::context
13-
#include "plssvm/backends/OpenCL/detail/error_code.hpp" // plssvm::opencl::detail::error_code
14-
#include "plssvm/backends/OpenCL/detail/kernel.hpp" // plssvm::opencl::detail::compute_kernel_name, plssvm::opencl::detail::kernel
15-
#include "plssvm/backends/OpenCL/detail/kernel_source_string.hpp" // plssvm::opencl::detail::kernel_src_string
16-
#include "plssvm/backends/OpenCL/exceptions.hpp" // plssvm::opencl::backend_exception
17-
#include "plssvm/constants.hpp" // plssvm::kernel_index_type, plssvm::kernel_index_type, plssvm::THREAD_BLOCK_SIZE, plssvm::INTERNAL_BLOCK_SIZE
18-
#include "plssvm/detail/arithmetic_type_name.hpp" // plssvm::detail::arithmetic_type_name
19-
#include "plssvm/detail/sha256.hpp" // plssvm::detail::sha256
20-
#include "plssvm/detail/string_conversion.hpp" // plssvm::detail::extract_first_integer_from_string
21-
#include "plssvm/detail/string_utility.hpp" // plssvm::detail::replace_all, plssvm::detail::to_lower_case, plssvm::detail::contains
22-
#include "plssvm/detail/utility.hpp" // plssvm::detail::erase_if
23-
#include "plssvm/exceptions/exceptions.hpp" // plssvm::unsupported_kernel_type_exception, plssvm::invalid_file_format_exception
24-
#include "plssvm/target_platforms.hpp" // plssvm::target_platform
11+
#include "plssvm/backends/OpenCL/detail/command_queue.hpp" // plssvm::opencl::detail::command_queue
12+
#include "plssvm/backends/OpenCL/detail/context.hpp" // plssvm::opencl::detail::context
13+
#include "plssvm/backends/OpenCL/detail/error_code.hpp" // plssvm::opencl::detail::error_code
14+
#include "plssvm/backends/OpenCL/detail/kernel.hpp" // plssvm::opencl::detail::compute_kernel_name, plssvm::opencl::detail::kernel
15+
#include "plssvm/backends/autogenerated/OpenCL/detail/kernel_source_string.hpp" // plssvm::opencl::detail::kernel_src_string
16+
#include "plssvm/backends/OpenCL/exceptions.hpp" // plssvm::opencl::backend_exception
17+
#include "plssvm/constants.hpp" // plssvm::kernel_index_type, plssvm::kernel_index_type, plssvm::THREAD_BLOCK_SIZE, plssvm::INTERNAL_BLOCK_SIZE
18+
#include "plssvm/detail/arithmetic_type_name.hpp" // plssvm::detail::arithmetic_type_name
19+
#include "plssvm/detail/sha256.hpp" // plssvm::detail::sha256
20+
#include "plssvm/detail/string_conversion.hpp" // plssvm::detail::extract_first_integer_from_string
21+
#include "plssvm/detail/string_utility.hpp" // plssvm::detail::replace_all, plssvm::detail::to_lower_case, plssvm::detail::contains
22+
#include "plssvm/detail/utility.hpp" // plssvm::detail::erase_if
23+
#include "plssvm/exceptions/exceptions.hpp" // plssvm::unsupported_kernel_type_exception, plssvm::invalid_file_format_exception
24+
#include "plssvm/target_platforms.hpp" // plssvm::target_platform
2525

2626
#include "CL/cl.h" // cl_program, cl_platform_id, cl_device_id, cl_uint, cl_device_type, cl_context,
2727
// CL_DEVICE_NAME, CL_QUEUE_DEVICE, CL_DEVICE_TYPE_ALL, CL_DEVICE_TYPE_CPU, CL_DEVICE_TYPE_GPU, CL_DEVICE_VENDOR, CL_PROGRAM_BUILD_LOG, CL_PROGRAM_BINARY_SIZES, CL_PROGRAM_BINARIES,

‎src/plssvm/backends/SYCL/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ function(configure_sycl include_name result_sources)
3434
message(STATUS "Configuring ${include_name}.")
3535
set(sources "")
3636
foreach(FILENAME ${PLSSVM_SYCL_SOURCES})
37-
string(REPLACE "SYCL" "${include_name}" NEW_FILENAME ${FILENAME})
37+
string(REPLACE "SYCL" "autogenerated/${include_name}" NEW_FILENAME ${FILENAME})
3838
configure_file(${FILENAME} ${NEW_FILENAME} @ONLY)
3939
list(APPEND sources ${NEW_FILENAME})
4040
set(${result_sources} ${sources} PARENT_SCOPE)
4141
endforeach()
4242
foreach(FILENAME ${PLSSVM_SYCL_INCLUDES})
43-
string(REPLACE "SYCL" "${include_name}" NEW_FILENAME ${FILENAME})
43+
string(REPLACE "SYCL" "autogenerated/${include_name}" NEW_FILENAME ${FILENAME})
4444
configure_file(${FILENAME} ${NEW_FILENAME} @ONLY)
4545
endforeach()
4646
endfunction()

‎src/plssvm/backends/SYCL/csvm.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* See the LICENSE.md file in the project root for full license information.
77
*/
88

9-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/csvm.hpp"
9+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/csvm.hpp"
1010

11-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/device_ptr.hpp" // plssvm::detail::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::device_ptr
12-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/utility.hpp" // plssvm::detail::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::get_device_list, plssvm::detail::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::device_synchronize
13-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/exceptions.hpp" // plssvm::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::backend_exception
14-
#include "plssvm/backends/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // PLSSVM_SYCL_BACKEND_COMPILER_HIPSYCL, forward declaration and namespace alias
11+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/device_ptr.hpp" // plssvm::detail::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::device_ptr
12+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/utility.hpp" // plssvm::detail::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::get_device_list, plssvm::detail::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::device_synchronize
13+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/exceptions.hpp" // plssvm::@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@::backend_exception
14+
#include "plssvm/backends/autogenerated/@PLSSVM_SYCL_BACKEND_INCLUDE_NAME@/detail/constants.hpp" // PLSSVM_SYCL_BACKEND_COMPILER_HIPSYCL, forward declaration and namespace alias
1515
#include "plssvm/backends/SYCL/predict_kernel.hpp" // plssvm::sycl_generic::kernel_w, plssvm::sycl_generic::predict_points_poly, plssvm::sycl_generic::predict_points_rbf
1616
#include "plssvm/backends/SYCL/q_kernel.hpp" // plssvm::sycl_generic::device_kernel_q_linear, plssvm::sycl_generic::device_kernel_q_poly, plssvm::sycl_generic::device_kernel_q_radial
1717
#include "plssvm/backends/SYCL/svm_kernel_hierarchical.hpp" // plssvm::sycl_generic::hierarchical_device_kernel_linear, plssvm::sysycl_genericcl::hierarchical_device_kernel_poly, plssvm::sycl_generic::hierarchical_device_kernel_radial

0 commit comments

Comments
 (0)