SWDEV-311585 - workaround dynamic loading functional issue in Blender

Change-Id: I815724c0bdcb712e40ec1ed11b9632fab7243f69
Tento commit je obsažen v:
haoyuan2
2021-12-10 11:48:00 -08:00
rodič 981ef060fb
revize d1a491b30b
3 změnil soubory, kde provedl 52 přidání a 42 odebrání
+6 -6
Zobrazit soubor
@@ -39,7 +39,7 @@ hipError_t hipChooseDevice(int* device, const hipDeviceProp_t* properties) {
hipDeviceProp_t currentProp = {0};
cl_uint validPropCount = 0;
cl_uint matchedCount = 0;
hipError_t err = hipGetDeviceProperties(&currentProp, i);
hipError_t err = ihipGetDeviceProperties(&currentProp, i);
if (properties->major != 0) {
validPropCount++;
if(currentProp.major >= properties->major) {
@@ -152,7 +152,7 @@ hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device)
//FIXME: should we cache the props, or just select from deviceHandle->info_?
hipDeviceProp_t prop = {0};
hipError_t err = hipGetDeviceProperties(&prop, device);
hipError_t err = ihipGetDeviceProperties(&prop, device);
if (err != hipSuccess) {
HIP_RETURN(err);
}
@@ -345,9 +345,9 @@ hipError_t hipDeviceGetByPCIBusId(int* device, const char*pciBusIdstr) {
ihipDeviceGetCount(&count);
for (cl_int i = 0; i < count; i++) {
hipDevice_t dev;
hipDeviceGet(&dev, i);
ihipDeviceGet(&dev, i);
hipDeviceProp_t prop;
hipGetDeviceProperties(&prop, dev);
ihipGetDeviceProperties(&prop, dev);
if ((pciBusID == prop.pciBusID) && (pciDomainID == prop.pciDomainID)
&& (pciDeviceID == prop.pciDeviceID)) {
@@ -385,7 +385,7 @@ hipError_t hipDeviceGetLimit ( size_t* pValue, hipLimit_t limit ) {
}
if(limit == hipLimitMallocHeapSize) {
hipDeviceProp_t prop;
hipGetDeviceProperties(&prop, ihipGetDevice());
ihipGetDeviceProperties(&prop, ihipGetDevice());
*pValue = prop.totalGlobalMem;
HIP_RETURN(hipSuccess);
@@ -409,7 +409,7 @@ hipError_t hipDeviceGetPCIBusId ( char* pciBusId, int len, int device ) {
}
hipDeviceProp_t prop;
hipGetDeviceProperties(&prop, device);
ihipGetDeviceProperties(&prop, device);
snprintf (pciBusId, len, "%04x:%02x:%02x.0",
prop.pciDomainID,