mirror of
https://gitlab.com/libeigen/eigen.git
synced 2024-12-21 07:19:46 +08:00
Merge changed from upstream
This commit is contained in:
a-doumoulakis
commit
7a8ba565f8
@ -111,7 +111,6 @@ endmacro(ei_add_test_internal)
|
||||
|
||||
# SYCL
|
||||
macro(ei_add_test_internal_sycl testname testname_with_suffix)
|
||||
|
||||
set(targetname ${testname_with_suffix})
|
||||
|
||||
if(EIGEN_ADD_TEST_FILENAME_EXTENSION)
|
||||
@ -120,9 +119,9 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
|
||||
set(filename ${testname}.cpp)
|
||||
endif()
|
||||
|
||||
set( include_file ${CMAKE_CURRENT_BINARY_DIR}/inc_${filename})
|
||||
set( bc_file ${CMAKE_CURRENT_BINARY_DIR}/${filename})
|
||||
set( host_file ${CMAKE_CURRENT_SOURCE_DIR}/${filename})
|
||||
set( include_file "${CMAKE_CURRENT_BINARY_DIR}/inc_${filename}")
|
||||
set( bc_file "${CMAKE_CURRENT_BINARY_DIR}/${filename}.sycl")
|
||||
set( host_file "${CMAKE_CURRENT_SOURCE_DIR}/${filename}")
|
||||
|
||||
if(NOT EIGEN_SYCL_TRISYCL)
|
||||
include_directories( SYSTEM ${COMPUTECPP_PACKAGE_ROOT_DIR}/include)
|
||||
@ -130,20 +129,21 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${include_file}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${host_file}\\\"" > ${include_file}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${bc_file}.sycl\\\"" >> ${include_file}
|
||||
DEPENDS ${filename} ${bc_file}.sycl
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${bc_file}\\\"" >> ${include_file}
|
||||
DEPENDS ${filename} ${bc_file}
|
||||
COMMENT "Building ComputeCpp integration header file ${include_file}"
|
||||
)
|
||||
|
||||
# Add a custom target for the generated integration header
|
||||
add_custom_target(${testname}_integration_header_sycl DEPENDS ${include_file})
|
||||
add_custom_target("${testname}_integration_header_sycl" DEPENDS ${include_file})
|
||||
|
||||
add_executable(${targetname} ${include_file})
|
||||
add_dependencies(${targetname} ${testname}_integration_header_sycl)
|
||||
add_dependencies(${targetname} "${testname}_integration_header_sycl")
|
||||
else()
|
||||
add_executable(${targetname} ${host_file})
|
||||
endif()
|
||||
|
||||
add_sycl_to_target(${targetname} ${filename} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
add_sycl_to_target(${targetname} ${CMAKE_CURRENT_BINARY_DIR} ${filename})
|
||||
|
||||
if (targetname MATCHES "^eigen2_")
|
||||
add_dependencies(eigen2_buildtests ${targetname})
|
||||
|
||||
@ -201,7 +201,8 @@ function(__build_spir targetName sourceFile binaryDir)
|
||||
${device_compiler_includes}
|
||||
-o ${outputSyclFile}
|
||||
-c ${CMAKE_CURRENT_SOURCE_DIR}/${sourceFile}
|
||||
DEPENDS ${sourceFile}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${sourceFile}
|
||||
IMPLICIT_DEPENDS CXX "${CMAKE_CURRENT_SOURCE_DIR}/${sourceFile}"
|
||||
WORKING_DIRECTORY ${binaryDir}
|
||||
COMMENT "Building ComputeCpp integration header file ${outputSyclFile}")
|
||||
|
||||
@ -233,8 +234,9 @@ endfunction()
|
||||
# sourceFile : Source file to be compiled for SYCL.
|
||||
# binaryDir : Intermediate directory to output the integration header.
|
||||
#
|
||||
function(add_sycl_to_target targetName sourceFile binaryDir)
|
||||
function(add_sycl_to_target targetName binaryDir sourceFile)
|
||||
|
||||
set(sourceFiles ${sourceFiles} ${ARGN})
|
||||
# Add custom target to run compute++ and generate the integration header
|
||||
__build_spir(${targetName} ${sourceFile} ${binaryDir})
|
||||
|
||||
@ -242,4 +244,4 @@ function(add_sycl_to_target targetName sourceFile binaryDir)
|
||||
target_link_libraries(${targetName} PUBLIC ${COMPUTECPP_RUNTIME_LIBRARY}
|
||||
PUBLIC ${OpenCL_LIBRARIES})
|
||||
|
||||
endfunction(add_sycl_to_target)
|
||||
endfunction(add_sycl_to_target)
|
||||
@ -81,28 +81,26 @@ struct memsetCghFunctor{
|
||||
}
|
||||
};
|
||||
|
||||
//get_devices returns all the available opencl devices. Either use device_selector or exclude devices that computecpp does not support (AMD OpenCL for CPU and intel GPU)
|
||||
//get_devices returns all the available opencl devices. Either use device_selector or exclude devices that computecpp does not support (AMD OpenCL for CPU and intel GPU)
|
||||
EIGEN_STRONG_INLINE auto get_sycl_supported_devices()->decltype(cl::sycl::device::get_devices()){
|
||||
auto devices = cl::sycl::device::get_devices();
|
||||
std::vector<cl::sycl::device>::iterator it =devices.begin();
|
||||
while(it!=devices.end()) {
|
||||
///FIXME: Currently there is a bug in amd cpu OpenCL
|
||||
auto name = (*it).template get_info<cl::sycl::info::device::name>();
|
||||
std::transform(name.begin(), name.end(), name.begin(), ::tolower);
|
||||
auto vendor = (*it).template get_info<cl::sycl::info::device::vendor>();
|
||||
std::vector<cl::sycl::device> supported_devices;
|
||||
auto plafrom_list =cl::sycl::platform::get_platforms();
|
||||
for(const auto& platform : plafrom_list){
|
||||
auto device_list = platform.get_devices();
|
||||
auto platform_name =platform.template get_info<cl::sycl::info::platform::name>();
|
||||
std::transform(platform_name.begin(), platform_name.end(), platform_name.begin(), ::tolower);
|
||||
for(const auto& device : device_list){
|
||||
auto vendor = device.template get_info<cl::sycl::info::device::vendor>();
|
||||
std::transform(vendor.begin(), vendor.end(), vendor.begin(), ::tolower);
|
||||
|
||||
if((*it).is_cpu() && vendor.find("amd")!=std::string::npos && vendor.find("apu") == std::string::npos){ // remove amd cpu as it is not supported by computecpp allow APUs
|
||||
it = devices.erase(it);
|
||||
//FIXME: currently there is a bug in intel gpu driver regarding memory allignment issue.
|
||||
}else if((*it).is_gpu() && name.find("intel")!=std::string::npos){
|
||||
it = devices.erase(it);
|
||||
}
|
||||
else{
|
||||
++it;
|
||||
bool unsuported_condition = (device.is_cpu() && platform_name.find("amd")!=std::string::npos && vendor.find("apu") == std::string::npos) ||
|
||||
(device.is_gpu() && platform_name.find("intel")!=std::string::npos);
|
||||
if(!unsuported_condition){
|
||||
std::cout << "Platform name "<< platform_name << std::endl;
|
||||
supported_devices.push_back(device);
|
||||
}
|
||||
}
|
||||
return devices;
|
||||
}
|
||||
return supported_devices;
|
||||
}
|
||||
|
||||
class QueueInterface {
|
||||
|
||||
@ -181,8 +181,8 @@ if(EIGEN_TEST_CXX11)
|
||||
ei_add_test_sycl(cxx11_tensor_inflation_sycl ${STD_CXX_FLAG})
|
||||
ei_add_test_sycl(cxx11_tensor_generator_sycl ${STD_CXX_FLAG})
|
||||
ei_add_test_sycl(cxx11_tensor_patch_sycl ${STD_CXX_FLAG})
|
||||
#ei_add_test_sycl(cxx11_tensor_image_patch_sycl ${STD_CXX_FLAG})
|
||||
#ei_add_test_sycl(cxx11_tensor_volume_patch_sycl ${STD_CXX_FLAG})
|
||||
ei_add_test_sycl(cxx11_tensor_image_patch_sycl ${STD_CXX_FLAG})
|
||||
ei_add_test_sycl(cxx11_tensor_volume_patch_sycl ${STD_CXX_FLAG})
|
||||
ei_add_test_sycl(cxx11_tensor_argmax_sycl ${STD_CXX_FLAG})
|
||||
ei_add_test_sycl(cxx11_tensor_custom_op_sycl ${STD_CXX_FLAG})
|
||||
endif(EIGEN_TEST_SYCL)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user