Conditionally disable std::byte APIs

Signed-off-by: Michael Aziz <[email protected]>

Author: 0x12CC

sycl/include/sycl/kernel_bundle.hpp

@@ -887,15 +887,18 @@ __SYCL_EXPORT bool is_source_kernel_bundle_supported(backend BE,
 /////////////////////////
 // syclex::create_kernel_bundle_from_source
 /////////////////////////
+
 __SYCL_EXPORT kernel_bundle<bundle_state::ext_oneapi_source>
 create_kernel_bundle_from_source(const context &SyclContext,
                                  source_language Language,
                                  const std::string &Source);
 
+#if (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0)
 __SYCL_EXPORT kernel_bundle<bundle_state::ext_oneapi_source>
 create_kernel_bundle_from_source(const context &SyclContext,
                                  source_language Language,
                                  const std::vector<std::byte> &Bytes);
+#endif
 
 /////////////////////////
 // syclex::build(source_kb) => exe_kb

sycl/source/detail/kernel_bundle_impl.hpp

@@ -372,12 +372,17 @@ class kernel_bundle_impl {
                                                 LogPtr);
       }
       if (Language == syclex::source_language::spirv) {
+#if (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0)
         const auto &SourceBytes =
             std::get<std::vector<std::byte>>(this->Source);
         std::vector<uint8_t> Result(SourceBytes.size());
         std::transform(SourceBytes.cbegin(), SourceBytes.cend(), Result.begin(),
                        [](std::byte B) { return static_cast<uint8_t>(B); });
         return Result;
+#else
+        throw sycl::exception(make_error_code(errc::invalid),
+                              "SPIR-V language support requires std::byte");
+#endif
       }
       throw sycl::exception(
           make_error_code(errc::invalid),
@@ -704,7 +709,11 @@ class kernel_bundle_impl {
   bundle_state MState;
   // ext_oneapi_kernel_compiler : Source, Languauge, KernelNames
   const syclex::source_language Language = syclex::source_language::opencl;
+#if (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0)
   const std::variant<std::string, std::vector<std::byte>> Source;
+#else
+  const std::variant<std::string> Source;
+#endif
   // only kernel_bundles created from source have KernelNames member.
   std::vector<std::string> KernelNames;
 };

sycl/source/kernel_bundle.cpp

@@ -387,6 +387,7 @@ bool is_source_kernel_bundle_supported(backend BE, source_language Language) {
 /////////////////////////
 // syclex::create_kernel_bundle_from_source
 /////////////////////////
+
 source_kb create_kernel_bundle_from_source(const context &SyclContext,
                                            source_language Language,
                                            const std::string &Source) {
@@ -403,6 +404,7 @@ source_kb create_kernel_bundle_from_source(const context &SyclContext,
   return sycl::detail::createSyclObjFromImpl<source_kb>(KBImpl);
 }
 
+#if (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0)
 source_kb
 create_kernel_bundle_from_source(const context &SyclContext,
                                  source_language Language,
@@ -416,6 +418,7 @@ create_kernel_bundle_from_source(const context &SyclContext,
       std::make_shared<kernel_bundle_impl>(SyclContext, Language, Bytes);
   return sycl::detail::createSyclObjFromImpl<source_kb>(KBImpl);
 }
+#endif
 
 /////////////////////////
 // syclex::detail::build_from_source(source_kb) => exe_kb