Skip to content

Commit

Permalink
Corrected review notes (EOLs, spurious spaces)
Browse files Browse the repository at this point in the history
  • Loading branch information
MathiasMagnus committed Mar 1, 2017
1 parent 91755f5 commit 935d673
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 25 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ project(triSYCL C CXX) # The name of the project (forward declare language )
#
# Platform-specific setup
#
if (UNIX) # If compiling under Linux
if(UNIX) # If compiling under Linux
set(BOOST_COMPUTE_INCPATH /usr/include/compute CACHE PATH "Path to Boost.Compute headers (default is: /usr/include/compute)")
find_package(Threads REQUIRED)
endif (UNIX)
endif(UNIX)

if (APPLE) # If compiling under OSX
if(APPLE) # If compiling under OSX
find_package(Threads REQUIRED)
endif (APPLE)
endif(APPLE)

#
# Set compiler-specific variables
#
# If compiling with MSVC++
if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_compile_options("/std:c++14") # Change to /std:c++latest once Boost::funtional is fixed (1.63.0 with toolset v141 not working)
string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Replace default Warning Level 3 with 4 (/Wall is pretty-much useless on MSVC, system headers are plagued with warnings)

Expand All @@ -71,7 +71,7 @@ project(triSYCL C CXX) # The name of the project (forward declare language )
add_compile_options("/wd4459") # warning C4459: declaration of '<id>' hides global declaration
add_compile_options("/wd4127") # warning C4127: conditional expression is constant
add_compile_options("/wd4456") # warning C4456: declaration of '<id>' hides previous local declaration
endif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")

# If compiling with g++
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ add_subdirectory(queue)
add_subdirectory(range)
add_subdirectory(single_task)
#add_subdirectory(SDAccel)
add_subdirectory(vector)
add_subdirectory(vector)
2 changes: 1 addition & 1 deletion tests/accessor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ declare_trisycl_test(TARGET accessor)
declare_trisycl_test(TARGET accessor_sizes)
declare_trisycl_test(TARGET demo_parallel_matrix_add)
declare_trisycl_test(TARGET iterators)
declare_trisycl_test(TARGET local_accessor_hierarchical_convolution)
declare_trisycl_test(TARGET local_accessor_hierarchical_convolution)
2 changes: 1 addition & 1 deletion tests/address_spaces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ s = yo man Size = 6
ps = yo manyo man Size = 12
e-salut
e-= Mont a ra mat\\?
3")
3")
2 changes: 1 addition & 1 deletion tests/buffer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ buffer \"b\" use_count\\(\\) is: 20
buffer \"c\" use_count\\(\\) is: 20
buffer \"a\" use_count\\(\\) is: 20
buffer \"z\" use_count\\(\\) is: 20
buffer \"z\" is read_only: 0")
buffer \"z\" is read_only: 0")
2 changes: 1 addition & 1 deletion tests/device/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ declare_trisycl_test(TARGET get_info)
declare_trisycl_test(TARGET type)
if(${BUILD_OPENCL})
declare_trisycl_test(TARGET opencl_device USES_OPENCL)
endif(${BUILD_OPENCL})
endif(${BUILD_OPENCL})
2 changes: 1 addition & 1 deletion tests/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ declare_trisycl_test(TARGET demo_parallel_matrix_add)
declare_trisycl_test(TARGET parallel_matrix_add TEST_REGEX "3 5 7 9 11 13")
declare_trisycl_test(TARGET parallel_vector_add TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET simpler_parallel_matrix_add TEST_REGEX "= 7")
declare_trisycl_test(TARGET vector_add TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET vector_add TEST_REGEX "6 8 11")
2 changes: 1 addition & 1 deletion tests/group/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ declare_trisycl_test(TARGET group TEST_REGEX
1 2 3
4 2 1
4 2 1
29")
29")
3 changes: 2 additions & 1 deletion tests/id/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ cjj via e = 3
12 15
6 2
1 2 3
5 6")
5 6")

2 changes: 1 addition & 1 deletion tests/jacobi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ declare_trisycl_test(TARGET jacobi2d-st-fxd)
declare_trisycl_test(TARGET jacobi2d-st-gen-var)
declare_trisycl_test(TARGET jacobi2d-st-var)
declare_trisycl_test(TARGET jacobi2d-tile)
declare_trisycl_test(TARGET jacobi2d)
declare_trisycl_test(TARGET jacobi2d)
2 changes: 1 addition & 1 deletion tests/kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ if(${BUILD_OPENCL})
declare_trisycl_test(TARGET opencl_kernel_vector_add_args USES_OPENCL TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET opencl_kernel_vector_add USES_OPENCL TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET opencl_kernel USES_OPENCL)
endif(${BUILD_OPENCL})
endif(${BUILD_OPENCL})
2 changes: 1 addition & 1 deletion tests/math/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ project (math) # The name of our project
declare_trisycl_test(TARGET math)
if(${BUILD_OPENCL})
declare_trisycl_test(TARGET opencl_type USES_OPENCL TEST_REGEX "x: 0, y: 1, z: 2")
endif(${BUILD_OPENCL})
endif(${BUILD_OPENCL})
2 changes: 1 addition & 1 deletion tests/multiple_compilation_units/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Local id = 1 \\(global id = 7\\)
Group id = 4
Local id = 0 \\(global id = 8\\)
Local id = 1 \\(global id = 9\\)
6 8 11")
6 8 11")
2 changes: 1 addition & 1 deletion tests/nd_item/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ declare_trisycl_test(TARGET nd_item TEST_REGEX
4 2 1
29
5 3 2
5 3 2 ")
5 3 2 ")
3 changes: 2 additions & 1 deletion tests/nd_range/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ declare_trisycl_test(TARGET nd_range TEST_REGEX
0 0
1
6 4
6 5")
6 5")

2 changes: 1 addition & 1 deletion tests/parallel_for/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ Local id = 1 \\(global id = 9\\)")
declare_trisycl_test(TARGET initializer_list)
declare_trisycl_test(TARGET integer)
declare_trisycl_test(TARGET item_no_offset)
declare_trisycl_test(TARGET item)
declare_trisycl_test(TARGET item)
2 changes: 1 addition & 1 deletion tests/pipe/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ declare_trisycl_test(TARGET blocking_pipe_producer_consumer TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET pipe_observers)
declare_trisycl_test(TARGET pipe_producer_consumer_stream_syntax TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET pipe_producer_consumer TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET static_pipe_producer_consumer TEST_REGEX "6 8 11")
declare_trisycl_test(TARGET static_pipe_producer_consumer TEST_REGEX "6 8 11")
2 changes: 1 addition & 1 deletion tests/platform/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ project (platform) # The name of our project
declare_trisycl_test(TARGET default_platform)
if(${BUILD_OPENCL})
declare_trisycl_test(TARGET opencl_platform USES_OPENCL)
endif(${BUILD_OPENCL})
endif(${BUILD_OPENCL})
2 changes: 1 addition & 1 deletion tests/queue/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ declare_trisycl_test(TARGET wait TEST_REGEX
Second")
if(${BUILD_OPENCL})
declare_trisycl_test(TARGET opencl_queue USES_OPENCL)
endif(${BUILD_OPENCL})
endif(${BUILD_OPENCL})
2 changes: 1 addition & 1 deletion tests/single_task/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.0) # The minimum version of CMake necessary to build this project
project (single_task) # The name of our project

declare_trisycl_test(TARGET single_task TEST_REGEX "1234")
declare_trisycl_test(TARGET single_task TEST_REGEX "1234")

0 comments on commit 935d673

Please sign in to comment.