Merge branch 'amd-develop' into amd-master

Change-Id: I8743f4653c63b6b19d9f055b2c2df76e1ad185cb

include/nvcc_detail/hip_runtime_api.h

@@ -464,6 +464,15 @@ inline static hipError_t hipSetDeviceFlags (unsigned int flags)
     return hipCUDAErrorTohipError(cudaSetDeviceFlags( flags ));
 }
 
+inline static hipError_t hipEventCreateWithFlags(hipEvent_t* event, unsigned int flags)
+{
+	return hipCUDAErrorTohipError(cudaEventCreateWithFlags(event, flags));
+}
+
+inline static hipError_t hipEventQuery(hipEvent_t event)
+{
+	return hipCUDAErrorTohipError(cudaEventQuery(event));
+}
 
 #ifdef __cplusplus
 }

packaging/hip_base.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(hip_base)
 
-install(DIRECTORY @hip_SOURCE_DIR@/src DESTINATION .)
 install(DIRECTORY @hip_SOURCE_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
 install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION . PATTERN "hip" EXCLUDE)