gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code Quality: Improved MSVC build

Browse Source
This commit is contained in:
Philippe Tillet
2015-07-21 16:50:07 -07:00
parent 4fe525631c
commit 1fa2ae648f
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -1,9 +1,5 @@
cmake_minimum_required(VERSION 2.8.10) cmake_minimum_required(VERSION 2.8.10)
if(WIN32)
SET(CMAKE_FIND_LIBRARY_PREFIXES "")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
endif()
# Add visibility of headers # Add visibility of headers
file( GLOB_RECURSE MAKE_HEADERS_VISIBLE_SRC *.cpp *.hpp *.h) file( GLOB_RECURSE MAKE_HEADERS_VISIBLE_SRC *.cpp *.hpp *.h)
add_custom_target( MAKE_HEADERS_VISIBLE SOURCES ${MAKE_HEADERS_VISIBLE_SRC} ) add_custom_target( MAKE_HEADERS_VISIBLE SOURCES ${MAKE_HEADERS_VISIBLE_SRC} )
@@ -22,6 +18,7 @@ endif()
#Compiler flags #Compiler flags
add_definitions(${BACKEND_DEFINES}) add_definitions(${BACKEND_DEFINES})
add_definitions("-DNOMINMAX")
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -pedantic") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -pedantic")
endif() endif()

2
bench/CMakeLists.txt
View File

@@ -44,7 +44,7 @@ foreach(PROG blas)
cuda_add_cublas_to_target(${PROG}-bench) cuda_add_cublas_to_target(${PROG}-bench)
else() else()
add_executable(${PROG}-bench ${PROG}.cpp) add_executable(${PROG}-bench ${PROG}.cpp)
set_target_properties(${PROG}-bench PROPERTIES COMPILE_FLAGS "${BACKEND_DEFINES} -Wall -Wextra ${BLAS_DEF_STR} -std=c++11") set_target_properties(${PROG}-bench PROPERTIES COMPILE_FLAGS "${BLAS_DEF_STR}")
endif() endif()
target_link_libraries(${PROG}-bench ${BLAS_LIBS}) target_link_libraries(${PROG}-bench ${BLAS_LIBS})
endforeach(PROG) endforeach(PROG)

12
cmake/FindOpenCL.cmake
View File

@@ -1,16 +1,16 @@
#Ideas for finding libOpenCL #Hints for finding libOpenCL
set(ANDROID_CL_GLOB_HINTS /opt/adreno-driver*/lib)
set(X86_CL_GLOB_HINTS /opt/AMDAPPSDK*/lib/x86_64)
#OpenCL Hints #OpenCL Hints
set(L_HINTS) set(L_HINTS $ENV{INTELOCLSDKROOT}/lib/x86)
if(ANDROID) if(ANDROID)
foreach(PATH ${ANDROID_GLOB_HINTS}) set(ANDROID_CL_GLOB_HINTS /opt/adreno-driver*/lib)
foreach(PATH ${ANDROID_CL_GLOB_HINTS})
file(GLOB _TMP ${PATH}) file(GLOB _TMP ${PATH})
set(L_HINTS ${L_HINTS} ${_TMP}) set(L_HINTS ${L_HINTS} ${_TMP})
endforeach() endforeach()
else() else()
foreach(PATH ${X86_GLOB_HINTS}) set(X86_CL_GLOB_HINTS /opt/AMDAPPSDK*/lib/x86_64)
foreach(PATH ${X86_CL_GLOB_HINTS})
file(GLOB _TMP ${PATH}) file(GLOB _TMP ${PATH})
set(L_HINTS ${L_HINTS} ${_TMP}) set(L_HINTS ${L_HINTS} ${_TMP})
endforeach() endforeach()

2
python/setup.py
View File

@@ -61,7 +61,7 @@ def main():
def find_opencl(): def find_opencl():
cvars = sysconfig.get_config_vars() cvars = sysconfig.get_config_vars()
is_on_android = '-mandroid' in cvars['PY_CFLAGS'] is_on_android = '-mandroid' in cvars['PY_CFLAGS']
lib = find_library('OpenCL', '/opt/adreno-driver*/lib' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64') lib = find_library('OpenCL', '' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64')
return {'include': '', 'lib': dirname(lib)} if lib else None return {'include': '', 'lib': dirname(lib)} if lib else None
def find_in_path(name, path): def find_in_path(name, path):

1
tests/linalg/CMakeLists.txt
View File

@@ -8,5 +8,4 @@ foreach(PROG axpy dot ger gemv gemm)
add_executable(${PROG}-test ${PROG}.cpp) add_executable(${PROG}-test ${PROG}.cpp)
add_test(${PROG} ${PROG}-test) add_test(${PROG} ${PROG}-test)
target_link_libraries(${PROG}-test isaac ${OPENCL_LIBRARIES}) target_link_libraries(${PROG}-test isaac ${OPENCL_LIBRARIES})
set_target_properties(${PROG}-test PROPERTIES COMPILE_FLAGS "${BACKEND_DEFINES} -Wall -Wextra -std=c++11")
endforeach(PROG) endforeach(PROG)