Merge branch 'amd_extensions_as_optional' into non-amd-openclport

Author: lcskrishna

openvx/ago/ago_util_opencl.cpp

@@ -138,7 +138,6 @@ int agoGpuOclCreateContext(AgoContext * context, cl_context opencl_context)
 		// use the given OpenCL context 
 		context->opencl_context_imported = true;
 		context->opencl_context = opencl_context;
-		// TBD: need to check devices in the context and set context->isVendorAmd accordingly
 	}
 	else {
 		// get AMD platform (if available)
@@ -155,13 +154,13 @@ int agoGpuOclCreateContext(AgoContext * context, cl_context opencl_context)
 		}
 		cl_platform_id platform_id = nullptr;
 		char opencl_platform_override[64] = "";
-		if (agoGetEnvironmentVariable("AGO_OPENCL_PLATFORM", opencl_platform_override, sizeof(opencl_platform_override))) {
+		if(agoGetEnvironmentVariable("AGO_OPENCL_PLATFORM", opencl_platform_override, sizeof(opencl_platform_override))) {
 			cl_uint index = (cl_uint)atoi(opencl_platform_override);
-			if (index < num_platforms) {
+			if(index < num_platforms) {
 				platform_id = platform_list[index];
 			}
 		}
-		if (!platform_id) {
+		if(!platform_id) {
 			platform_id = platform_list[0];
 			for (int i = 0; i < (int)num_platforms; i++) {
 				char vendor[128] = { 0 };

openvx/include/vx_ext_amd.h

@@ -58,7 +58,7 @@ THE SOFTWARE.
 enum ago_type_public_e {
 	/*! \brief AMD data types
 	*/
-    VX_TYPE_FLOAT16             = 0x00F,                     // 16-bit float data type
+	VX_TYPE_FLOAT16             = 0x00F,                     // 16-bit float data type
 	VX_TYPE_STRING_AMD          = VX_TYPE_SCALAR_MAX,        // scalar data type for string
 
 	/*! \brief AMD data structs

runvx/vxTensor.cpp

@@ -128,7 +128,7 @@ int CVxParamTensor::InitializeIO(vx_context context, vx_graph graph, vx_referenc
 		m_size *= m_dims[i];
 	}
 	m_data = new vx_uint8[m_size];
-	if (!m_data) ReportError("ERROR: memory allocation failed for tensor: %u\n", m_size);
+	if (!m_data) ReportError("ERROR: memory allocation failed for tensor: %u\n", (vx_uint32)m_size);
 
 	// process I/O parameters
 	if (*io_params == ':') io_params++;
@@ -227,7 +227,7 @@ int CVxParamTensor::ReadFrame(int frameNumber)
 		}
 	}
 	if (fread(m_data, 1, m_size, fp) != m_size)
-		ReportError("ERROR: not enough data (%d bytes) in %s\n", m_size, fileName);
+		ReportError("ERROR: not enough data (%d bytes) in %s\n", (vx_uint32)m_size, fileName);
 	vx_status status = vxCopyTensorPatch(m_tensor, m_num_of_dims, nullptr, nullptr, m_stride, m_data, VX_WRITE_ONLY, VX_MEMORY_TYPE_HOST);
 	fclose(fp);
 	if (status != VX_SUCCESS)
@@ -271,7 +271,7 @@ int CVxParamTensor::CompareFrame(int frameNumber)
 		ReportError("ERROR: Unable to open: %s\n", fileName);
 	}
 	if (fread(m_data, 1, m_size, fp) != m_size)
-		ReportError("ERROR: not enough data (%d bytes) in %s\n", m_size, fileName);
+		ReportError("ERROR: not enough data (%d bytes) in %s\n", (vx_uint32)m_size, fileName);
 	fclose(fp);
 
 	// compare
@@ -339,9 +339,9 @@ int CVxParamTensor::CompareFrame(int frameNumber)
 		mismatchDetected = (maxError > m_maxErrorLimit) ? true : false;
 		mismatchDetected = (avgError > m_avgErrorLimit) ? true : mismatchDetected;
 		if (mismatchDetected)
-			printf("ERROR: tensor COMPARE MISMATCHED [max-err: %d] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
+			printf("ERROR: tensor COMPARE MISMATCHED [max-err: %.6f] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
 		else if (m_verbose)
-			printf("OK: tensor COMPARE MATCHED [max-err: %d] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
+			printf("OK: tensor COMPARE MATCHED [max-err: %.6f] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
 	}
 	else if (m_data_type == VX_TYPE_FLOAT16) {
 		vx_float32 maxError = 0;
@@ -373,9 +373,9 @@ int CVxParamTensor::CompareFrame(int frameNumber)
 		mismatchDetected = (maxError > m_maxErrorLimit) ? true : false;
 		mismatchDetected = (avgError > m_avgErrorLimit) ? true : mismatchDetected;
 		if (mismatchDetected)
-			printf("ERROR: tensor COMPARE MISMATCHED [max-err: %d] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
+			printf("ERROR: tensor COMPARE MISMATCHED [max-err: %.6f] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
 		else if (m_verbose)
-			printf("OK: tensor COMPARE MATCHED [max-err: %d] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
+			printf("OK: tensor COMPARE MATCHED [max-err: %.6f] [avg-err: %.6f] for %s with frame#%d of %s\n", maxError, avgError, GetVxObjectName(), frameNumber, fileName);
 	}
 	else {
 		for (vx_size d3 = 0; d3 < m_dims[3]; d3++) {