From 0de0e635564cce6fc3d87b34f655c86cdb3e3b5c Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Mon, 25 Sep 2017 06:54:29 +0530 Subject: [PATCH 1/2] Fixed hipTexture fetch issue [ROCm/clr commit: 9e07b08ce55d26c221478ef84734f48fa994ae21] --- projects/clr/hipamd/src/hip_texture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/hipamd/src/hip_texture.cpp b/projects/clr/hipamd/src/hip_texture.cpp index 656c160f00..030772f65e 100644 --- a/projects/clr/hipamd/src/hip_texture.cpp +++ b/projects/clr/hipamd/src/hip_texture.cpp @@ -255,7 +255,7 @@ hipError_t hipCreateTextureObject(hipTextureObject_t* pTexObject, fillSamplerDescriptor(samplerDescriptor, pTexDesc->addressMode[0], pTexDesc->filterMode, pTexDesc->normalizedCoords); hsa_access_permission_t permission = HSA_ACCESS_PERMISSION_RW; - if (HSA_STATUS_SUCCESS != hsa_ext_image_create(*agent, &imageDescriptor, devPtr, permission, &(pTexture->image)) || + if (HSA_STATUS_SUCCESS != hsa_ext_image_create_with_layout(*agent, &imageDescriptor, devPtr, permission, HSA_EXT_IMAGE_DATA_LAYOUT_LINEAR, 0, 0, &(pTexture->image)) || HSA_STATUS_SUCCESS != hsa_ext_sampler_create(*agent, &samplerDescriptor, &(pTexture->sampler))) { return ihipLogStatus(hipErrorRuntimeOther); } @@ -394,7 +394,7 @@ hipError_t ihipBindTextureImpl(int dim, hsa_access_permission_t permission = HSA_ACCESS_PERMISSION_RW; - if (HSA_STATUS_SUCCESS != hsa_ext_image_create(*agent, &imageDescriptor, devPtr, permission, &(pTexture->image)) || + if (HSA_STATUS_SUCCESS != hsa_ext_image_create_with_layout(*agent, &imageDescriptor, devPtr, permission, HSA_EXT_IMAGE_DATA_LAYOUT_LINEAR, 0, 0, &(pTexture->image)) || HSA_STATUS_SUCCESS != hsa_ext_sampler_create(*agent, &samplerDescriptor, &(pTexture->sampler))) { return ihipLogStatus(hipErrorRuntimeOther); } @@ -468,7 +468,7 @@ hipError_t ihipBindTexture2DImpl(int dim, hsa_access_permission_t permission = HSA_ACCESS_PERMISSION_RW; - if (HSA_STATUS_SUCCESS != hsa_ext_image_create(*agent, &imageDescriptor, devPtr, permission, &(pTexture->image)) || + if (HSA_STATUS_SUCCESS != hsa_ext_image_create_with_layout(*agent, &imageDescriptor, devPtr, permission, HSA_EXT_IMAGE_DATA_LAYOUT_LINEAR, 0, 0, &(pTexture->image)) || HSA_STATUS_SUCCESS != hsa_ext_sampler_create(*agent, &samplerDescriptor, &(pTexture->sampler))) { return ihipLogStatus(hipErrorRuntimeOther); } @@ -567,7 +567,7 @@ hipError_t ihipBindTextureToArrayImpl(int dim, hsa_access_permission_t permission = HSA_ACCESS_PERMISSION_RW; - if (HSA_STATUS_SUCCESS != hsa_ext_image_create(*agent, &imageDescriptor, array->data, permission, &(pTexture->image)) || + if (HSA_STATUS_SUCCESS != hsa_ext_image_create_with_layout(*agent, &imageDescriptor, array->data, permission, HSA_EXT_IMAGE_DATA_LAYOUT_LINEAR, 0, 0, &(pTexture->image)) || HSA_STATUS_SUCCESS != hsa_ext_sampler_create(*agent, &samplerDescriptor, &(pTexture->sampler))) { return ihipLogStatus(hipErrorRuntimeOther); } From 71a01e5bbb7bc7156555a907e0f3413f4b77745f Mon Sep 17 00:00:00 2001 From: Kent Knox Date: Tue, 26 Sep 2017 14:33:29 -0500 Subject: [PATCH 2/2] Force organization name to be lowercase for docker error building docker image because of CamelCasing [ROCm/clr commit: 6f8592a863034b426b241cfd7799b20f10f6a3c0] --- projects/clr/hipamd/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/hipamd/Jenkinsfile b/projects/clr/hipamd/Jenkinsfile index db6cec1e7b..01e1e1d1da 100644 --- a/projects/clr/hipamd/Jenkinsfile +++ b/projects/clr/hipamd/Jenkinsfile @@ -291,7 +291,7 @@ String hcc_integration_testing( String inside_args, String job, String build_con { // Attempt to make unique docker image names for each build, to support concurrent builds // Mangle docker org name with upstream build info - String testing_org_name = 'hcc-test-' + get_upstream_build_project( ).replaceAll('/','-') + '-' + get_upstream_build_num( ) + String testing_org_name = 'hcc-test-' + get_upstream_build_project( ).replaceAll('/','-').toLowerCase( ) + '-' + get_upstream_build_num( ) // String testing_org_name = 'hcc-test-artifacts-download' // Tag image name with this build number