Changeset 3078 in CLRX


Ignore:
Timestamp:
May 27, 2017, 9:39:11 AM (19 months ago)
Author:
matszpk
Message:

CLRadeonExtender: Add support for AMDGPU-PRO for SLES/OpenSUSE.

Location:
CLRadeonExtender/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CLRadeonExtender/trunk/CLRX/Config.h.in

    r2779 r3078  
    3939#cmakedefine HAVE_GPUPRO_NEW
    4040
     41#cmakedefine HAVE_GPUPRO_SLES
     42
    4143/* architecture setup */
    4244
     
    141143#    elif defined(HAVE_GPUPRO_NEW)
    142144#    define DEFAULT_AMDOCLPATH "/opt/amdgpu-pro/lib/i386-linux-gnu/libamdocl32.so"
     145#    elif defined(HAVE_GPUPRO_SLES)
     146#    define DEFAULT_AMDOCLPATH "/opt/amdgpu-pro/lib/libamdocl32.so"
    143147#    else
    144148#    define DEFAULT_AMDOCLPATH "/usr/lib/libamdocl32.so"
     
    149153#    elif defined(HAVE_GPUPRO_NEW)
    150154#    define DEFAULT_AMDOCLPATH "/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamdocl64.so"
     155#    elif defined(HAVE_GPUPRO_SLES)
     156#    define DEFAULT_AMDOCLPATH "/opt/amdgpu-pro/lib64/libamdocl64.so"
    151157#    else
    152158#    define DEFAULT_AMDOCLPATH "/usr/lib64/libamdocl64.so"
  • CLRadeonExtender/trunk/CMakeLists.txt

    r2779 r3078  
    120120    MESSAGE(STATUS "AMDGPU-PRO for Ubuntu is found")
    121121ENDIF(IS_DIRECTORY "/usr/lib/x86_64-linux-gnu/amdgpu-pro")
    122 IF(IS_DIRECTORY "/opt/amdgpu-pro/lib/x86_64-linux-gnu")
     122IF(IS_DIRECTORY "/opt/amdgpu-pro/lib/x86_64-linux-gnu" OR
     123        IS_DIRECTORY "/opt/amdgpu-pro/lib/i386-linux-gnu")
    123124    SET(HAVE_GPUPRO_NEW TRUE)
    124125    MESSAGE(STATUS "New AMDGPU-PRO is found")
    125 ENDIF(IS_DIRECTORY "/opt/amdgpu-pro/lib/x86_64-linux-gnu")
     126ENDIF(IS_DIRECTORY "/opt/amdgpu-pro/lib/x86_64-linux-gnu" OR
     127        IS_DIRECTORY "/opt/amdgpu-pro/lib/i386-linux-gnu")
     128IF (NOT HAVE_GPUPRO_NEW AND NOT HAVE_UBUNTU_GPUPRO)
     129    IF(IS_DIRECTORY "/opt/amdgpu-pro/lib64" OR IS_DIRECTORY "/opt/amdgpu-pro/lib")
     130        SET(HAVE_GPUPRO_SLES TRUE)
     131        MESSAGE(STATUS "SLES AMDGPU-PRO is found")
     132    ENDIF(IS_DIRECTORY "/opt/amdgpu-pro/lib64" OR IS_DIRECTORY "/opt/amdgpu-pro/lib")
     133ENDIF(NOT HAVE_GPUPRO_NEW AND NOT HAVE_UBUNTU_GPUPRO)
    126134
    127135IF("${PROJECT_SOURCE_DIR}" MATCHES "${PROJECT_BINARY_DIR}")
     
    227235        ENDIF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
    228236    ENDIF(HAVE_GPUPRO_NEW)
     237    IF(HAVE_GPUPRO_SLES)
     238        IF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
     239            SET(OPENCL_LIBRARY_DIRS "/opt/amdgpu-pro/lib64")
     240        ELSE((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
     241            SET(OPENCL_LIBRARY_DIRS "/opt/amdgpu-pro/lib")
     242        ENDIF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
     243    ENDIF(HAVE_GPUPRO_SLES)
    229244ENDIF(HAVE_OPENCL)
    230245
Note: See TracChangeset for help on using the changeset viewer.