Skip to content
This repository has been archived by the owner on Jan 26, 2024. It is now read-only.

Bitonic sort2.0 #83

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bitonic sort2.0 #83

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
236d5fc
update Cmake files to use recent version of FindComputeCpp.cmake
Aug 22, 2018
b4b6f21
add working example of new bitonic sort
Aug 22, 2018
d774e33
remove unnecesary wait after CG calls
Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ find_package(Threads REQUIRED)
if (USE_COMPUTECPP)
message(STATUS " Using ComputeCpp CMake")

message(STATUS " Path to ComputeCpp implementation: ${COMPUTECPP_PACKAGE_ROOT_DIR} ")
message(STATUS " Path to ComputeCpp implementation: ${ComputeCpp_DIR} ")

set(CMAKE_CXX_STANDARD 11)

Expand All @@ -23,21 +23,23 @@ if (USE_COMPUTECPP)
add_definitions(-DSYCL_PSTL_USE_OLD_ALGO)
set(COMPUTECPP_DEVICE_COMPILER_FLAGS "${COMPUTECPP_DEVICE_COMPILER_FLAGS} -DSYCL_PSTL_USE_OLD_ALGO")

include_directories("${COMPUTECPP_INCLUDE_DIRECTORY}")
include_directories("${ComputeCpp_DIR}/include")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably change this to target_include_directories.



else()
message(STATUS " Using triSYCL CMake")
include(FindTriSYCL)
endif()


# PSTL specific
include_directories("include")

add_subdirectory (src)
add_subdirectory (examples)
add_subdirectory (tests)
#
# TODO: update CMakeLists.txt to work with updated FindComputeCpp.cmake
#
#add_subdirectory (tests)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No commented-out code in the MR please.


if (PARALLEL_STL_BENCHMARKS)
add_subdirectory (benchmarks)
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -8,11 +8,11 @@ foreach(file ${EXAMPLE_FILES})
include_directories(${COMPUTECPP_INCLUDE_DIRECTORY})

add_executable(${SOURCE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_NAME}.cpp )
target_compile_options(${SOURCE_NAME} PUBLIC ${HOST_COMPILER_OPTIONS})
target_compile_options(${SOURCE_NAME} PUBLIC ${HOST_COMPILER_OPTIONS} ${CMAKE_THREAD_LIBS_INIT})

target_link_libraries(${SOURCE_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
#target_link_libraries(${SOURCE_NAME} PUBLIC )

add_sycl_to_target(${SOURCE_NAME} ${CMAKE_CURRENT_BINARY_DIR}
add_sycl_to_target( TARGET ${SOURCE_NAME} SOURCES
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where are all this CMake changes coming from? did you have to do them or you just updated the cmake from some other project?

${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_NAME}.cpp)


Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ then
CMAKE_ARGS="$CMAKE_ARGS -DUSE_COMPUTECPP=OFF $@"
else
echo "build.sh entering mode: ComputeCpp"
CMAKE_ARGS="$CMAKE_ARGS -DCOMPUTECPP_PACKAGE_ROOT_DIR=$(readlink -f $1)"
CMAKE_ARGS="$CMAKE_ARGS -DComputeCpp_DIR=$(readlink -f $1)"
shift
fi

Expand Down