more fixes

Author: Alexander Batashev

sycl/include/CL/sycl/backend/cuda.hpp

@@ -41,7 +41,9 @@ template <> struct interop<backend::cuda, queue> { using type = CUstream; };
 
 template <> struct interop<backend::cuda, event> { using type = CUevent; };
 
+#ifdef __SYCL_INTERNAL_API
 template <> struct interop<backend::cuda, program> { using type = CUmodule; };
+#endif
 
 template <typename DataT, int Dimensions, access::mode AccessMode>
 struct interop<backend::cuda, accessor<DataT, Dimensions, AccessMode,

sycl/include/CL/sycl/backend/opencl.hpp

@@ -35,9 +35,11 @@ template <> struct interop<backend::opencl, queue> {
   using type = cl_command_queue;
 };
 
+#ifdef __SYCL_INTERNAL_API
 template <> struct interop<backend::opencl, program> {
   using type = cl_program;
 };
+#endif
 
 template <> struct interop<backend::opencl, event> { using type = cl_event; };
 
@@ -109,8 +111,10 @@ namespace opencl {
 __SYCL_EXPORT platform make_platform(pi_native_handle NativeHandle);
 __SYCL_EXPORT device make_device(pi_native_handle NativeHandle);
 __SYCL_EXPORT context make_context(pi_native_handle NativeHandle);
+#ifdef __SYCL_INTERNAL_API
 __SYCL_EXPORT program make_program(const context &Context,
                                    pi_native_handle NativeHandle);
+#endif
 __SYCL_EXPORT queue make_queue(const context &Context,
                                pi_native_handle InteropHandle);
 
@@ -136,12 +140,14 @@ T make(typename interop<backend::opencl, T>::type Interop) {
 }
 
 // Construction of SYCL program.
+#ifdef __SYCL_INTERNAL_API
 template <typename T, typename detail::enable_if_t<
                           std::is_same<T, program>::value> * = nullptr>
 T make(const context &Context,
        typename interop<backend::opencl, T>::type Interop) {
   return make_program(Context, detail::pi::cast<pi_native_handle>(Interop));
 }
+#endif
 
 // Construction of SYCL queue.
 template <typename T, typename detail::enable_if_t<

sycl/include/sycl/ext/oneapi/backend/level_zero.hpp

@@ -35,9 +35,11 @@ template <> struct interop<backend::level_zero, event> {
   using type = ze_event_handle_t;
 };
 
+#ifdef __SYCL_INTERNAL_API
 template <> struct interop<backend::level_zero, program> {
   using type = ze_module_handle_t;
 };
+#endif
 
 template <typename DataT, int Dimensions, access::mode AccessMode>
 struct interop<backend::level_zero, accessor<DataT, Dimensions, AccessMode,
@@ -141,8 +143,10 @@ __SYCL_EXPORT device make_device(const platform &Platform,
 __SYCL_EXPORT context make_context(const std::vector<device> &DeviceList,
                                    pi_native_handle NativeHandle,
                                    bool keep_ownership = false);
+#ifdef __SYCL_INTERNAL_API
 __SYCL_EXPORT program make_program(const context &Context,
                                    pi_native_handle NativeHandle);
+#endif
 __SYCL_EXPORT queue make_queue(const context &Context,
                                pi_native_handle InteropHandle,
                                bool keep_ownership = false);
@@ -187,13 +191,15 @@ T make(const std::vector<device> &DeviceList,
 }
 
 // Construction of SYCL program.
+#ifdef __SYCL_INTERNAL_API
 template <typename T, typename detail::enable_if_t<
                           std::is_same<T, program>::value> * = nullptr>
 __SYCL_DEPRECATED("Use SYCL 2020 sycl::make_kernel_bundle free function")
 T make(const context &Context,
        typename interop<backend::level_zero, T>::type Interop) {
   return make_program(Context, reinterpret_cast<pi_native_handle>(Interop));
 }
+#endif
 
 // Construction of SYCL queue.
 template <typename T, typename detail::enable_if_t<