Cycles: re-enable HIP on Linux #107662
|
@ -1697,13 +1697,10 @@ class CyclesPreferences(bpy.types.AddonPreferences):
|
||||||
col.label(text=iface_("and AMD Radeon Pro %s driver or newer") % driver_version,
|
col.label(text=iface_("and AMD Radeon Pro %s driver or newer") % driver_version,
|
||||||
icon='BLANK1', translate=False)
|
icon='BLANK1', translate=False)
|
||||||
elif sys.platform.startswith("linux"):
|
elif sys.platform.startswith("linux"):
|
||||||
if True:
|
driver_version = "22.10"
|
||||||
col.label(text="HIP temporarily disabled due to compiler bugs", icon='BLANK1')
|
col.label(text="Requires AMD GPU with Vega or RDNA architecture", icon='BLANK1')
|
||||||
else:
|
col.label(text=iface_("and AMD driver version %s or newer") % driver_version, icon='BLANK1',
|
||||||
driver_version = "22.10"
|
translate=False)
|
||||||
col.label(text="Requires AMD GPU with Vega or RDNA architecture", icon='BLANK1')
|
|
||||||
col.label(text=iface_("and AMD driver version %s or newer") % driver_version, icon='BLANK1',
|
|
||||||
translate=False)
|
|
||||||
elif device_type == 'ONEAPI':
|
elif device_type == 'ONEAPI':
|
||||||
import sys
|
import sys
|
||||||
if sys.platform.startswith("win"):
|
if sys.platform.startswith("win"):
|
||||||
|
|
|
@ -43,18 +43,12 @@ endif()
|
||||||
|
|
||||||
if(WITH_CYCLES_DEVICE_HIP)
|
if(WITH_CYCLES_DEVICE_HIP)
|
||||||
if(WITH_CYCLES_HIP_BINARIES)
|
if(WITH_CYCLES_HIP_BINARIES)
|
||||||
if(UNIX)
|
# Need at least HIP 5.5 to solve compiler bug affecting the kernel.
|
||||||
# Disabled until there is a HIP 5.5 release for Linux.
|
find_package(HIP 5.5.0)
|
||||||
set(WITH_CYCLES_HIP_BINARIES OFF)
|
set_and_warn_library_found("HIP compiler" HIP_FOUND WITH_CYCLES_HIP_BINARIES)
|
||||||
message(STATUS "HIP temporarily disabled due to compiler bugs")
|
|
||||||
else()
|
|
||||||
# Need at least HIP 5.5 to solve compiler bug affecting the kernel.
|
|
||||||
find_package(HIP 5.5.0)
|
|
||||||
set_and_warn_library_found("HIP compiler" HIP_FOUND WITH_CYCLES_HIP_BINARIES)
|
|
||||||
|
|
||||||
if(HIP_FOUND)
|
if(HIP_FOUND)
|
||||||
message(STATUS "Found HIP ${HIP_HIPCC_EXECUTABLE} (${HIP_VERSION})")
|
message(STATUS "Found HIP ${HIP_HIPCC_EXECUTABLE} (${HIP_VERSION})")
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue