Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging

include/hcc.h

@@ -0,0 +1,8 @@
+#ifndef HCC_H
+#define HCC_H
+
+#if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
+#include <hcc_detail/hcc_acc.h>
+#endif
+
+#endif

include/hcc_detail/hcc_acc.h

@@ -0,0 +1,20 @@
+#ifndef HCC_ACC_H
+#define HCC_ACC_H
+#include "hip_runtime_api.h"
+
+#if __cplusplus
+#ifdef __HCC__
+#include <hc.hpp>
+/**
+ * @brief Return hc::accelerator associated with the specified deviceId
+ */
+hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator *acc);
+
+/**
+ * @brief Return hc::accelerator_view associated with the specified stream
+ */
+hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view **av);
+#endif
+#endif
+
+#endif

include/hcc_detail/hip_runtime_api.h

@@ -1041,20 +1041,6 @@ hipError_t hipDriverGetVersion(int *driverVersion) ;
  * @endcode
  *
  */
-#if __cplusplus
-#ifdef __HCC__
-#include <hc.hpp>
-/**
- * @brief Return hc::accelerator associated with the specified deviceId
- */
-hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator *acc);
-
-/**
- * @brief Return hc::accelerator_view associated with the specified stream
- */
-hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view **av);
-#endif
-#endif
 
 // end-group HCC_Specific
 /**