Fix BLAS compilation with AdaptiveCpp

1. Remove unused function enqueue_deallocate in helper.h (left over from refactoring).
2. Add missing BLAS_ENABLE_COMPLEX protection in Gemm::store_packet.
3. Skip second template parameter in vec::load and vec::store when compiling with AdaptiveCpp, which doesn't support it.
4. Improve detection of using AdaptiveCpp in CMake configuration to disable complex data support.

Author: rafbiels

onemath/sycl/blas/CMakeLists.txt

@@ -65,10 +65,9 @@ option(BLAS_ENABLE_EXTENSIONS "Whether to enable BLAS extensions" ON)
 option(BLAS_ENABLE_COMPLEX "Whether to enable complex data type for GEMM" ON)
 option(BLAS_ENABLE_HALF "Whether to enable sycl::half data type for supported operators" ON)
 
-if (SYCL_COMPILER MATCHES "adaptivecpp") 
+if (SYCL_COMPILER MATCHES "adaptivecpp" OR ${CMAKE_CXX_COMPILER} MATCHES "acpp|syclcc")
   if(BLAS_ENABLE_COMPLEX)
-    message(STATUS "SYCL Complex data is not supported on AdaptiveCpp/hipSYCL. Complex
-            data type is disabled")
+    message(STATUS "SYCL Complex data is not supported on AdaptiveCpp/hipSYCL. Complex data type is disabled")
     set(BLAS_ENABLE_COMPLEX OFF)
   endif()
 endif()

onemath/sycl/blas/include/helper.h

@@ -88,27 +88,6 @@ using add_const = typename std::conditional<
         typename std::remove_pointer<container_t>::type>::type>::type,
     container_t>::type;
 
-template <typename container_t>
-typename std::enable_if<std::is_same<
-    container_t, typename AllocHelper<typename ValueType<container_t>::type,
-                                      AllocType::usm>::type>::value>::type
-enqueue_deallocate(std::vector<sycl::event> dependencies, container_t mem,
-                   sycl::queue q) {
-#ifdef SB_ENABLE_USM
-  auto event = q.submit([&](sycl::handler &cgh) {
-    cgh.depends_on(dependencies);
-    cgh.host_task([=]() { sycl::free(mem, q); });
-  });
-#endif
-  return;
-}
-
-template <typename container_t>
-typename std::enable_if<std::is_same<
-    container_t, typename AllocHelper<typename ValueType<container_t>::type,
-                                      AllocType::buffer>::type>::value>::type
-enqueue_deallocate(std::vector<sycl::event>, container_t mem, sycl::queue q) {}
-
 inline bool has_local_memory(sycl::queue &q) {
   return (
       q.get_device().template get_info<sycl::info::device::local_mem_type>() ==

onemath/sycl/blas/src/operations/blas3/gemm_local.hpp

@@ -527,6 +527,7 @@ class Gemm<input_t, output_t, DoubleBuffer, NbcA, NbcB, ClSize, TileType,
       element_t *reg, OutputPointerType out_ptr) {
     vector_out_t out_vec{};
 
+#ifdef BLAS_ENABLE_COMPLEX
     // This if-statement is necessary starting from late 2024 nightly, because
     // an update made casting raw pointers of sycl::complex to multi_ptr
     // ambiguous.
@@ -542,14 +543,26 @@ class Gemm<input_t, output_t, DoubleBuffer, NbcA, NbcB, ClSize, TileType,
 
       out_vec.template store<address_t::global_space,
                              sycl::access::decorated::legacy>(0, out_ptr);
-    } else {
+    } else
+#endif
+    {
+#ifdef __ADAPTIVECPP__
+      // AdaptiveCpp 24.10 doesn't support IsDecorated template parameter here
+      out_vec.template load<address_t::private_space>(
+#else
       out_vec.template load<address_t::private_space,
                             sycl::access::decorated::legacy>(
+#endif
           0, sycl::multi_ptr<const element_t, address_t::private_space>(reg));
       out_vec *= alpha_;
 
+#ifdef __ADAPTIVECPP__
+      // AdaptiveCpp 24.10 doesn't support IsDecorated template parameter here
+      out_vec.template store<address_t::global_space>(
+#else
       out_vec.template store<address_t::global_space,
                              sycl::access::decorated::legacy>(
+#endif
           0, sycl::multi_ptr<element_t, address_t::global_space>(out_ptr));
     }
   }