[SYCL][BLAS] Move portBLAS to UXL Foundation as generic SYCL BLAS

CMakeLists.txt

@@ -45,7 +45,7 @@ endif()
 option(ENABLE_CUBLAS_BACKEND "Enable the cuBLAS backend for the BLAS interface" OFF)
 option(ENABLE_ROCBLAS_BACKEND "Enable the rocBLAS backend for the BLAS interface" OFF)
 option(ENABLE_NETLIB_BACKEND "Enable the Netlib backend for the BLAS interface" OFF)
-option(ENABLE_PORTBLAS_BACKEND "Enable the portBLAS backend for the BLAS interface. Cannot be used with other BLAS backends." OFF)
+option(ENABLE_GENERIC_BLAS_BACKEND "Enable the generic BLAS backend for the BLAS interface. Cannot be used with other BLAS backends." OFF)
 
 # rand
 option(ENABLE_CURAND_BACKEND "Enable the cuRAND backend for the RNG interface" OFF)
@@ -82,7 +82,7 @@ if(ENABLE_MKLCPU_BACKEND
         OR ENABLE_CUBLAS_BACKEND
         OR ENABLE_ROCBLAS_BACKEND
         OR ENABLE_NETLIB_BACKEND
-        OR ENABLE_PORTBLAS_BACKEND)
+        OR ENABLE_GENERIC_BLAS_BACKEND)
   list(APPEND DOMAINS_LIST "blas")
 endif()
 if(ENABLE_MKLCPU_BACKEND
@@ -110,13 +110,13 @@ if(ENABLE_MKLCPU_BACKEND
   list(APPEND DOMAINS_LIST "sparse_blas")
 endif()
 
-if(ENABLE_PORTBLAS_BACKEND
+if(ENABLE_GENERIC_BLAS_BACKEND
 	AND (ENABLE_MKLCPU_BACKEND
 		OR ENABLE_MKLGPU_BACKEND
 		OR ENABLE_CUBLAS_BACKEND
 		OR ENABLE_ROCBLAS_BACKEND
 		OR ENABLE_NETLIB_BACKEND))
-	message(FATAL_ERROR "ENABLE_PORTBLAS_BACKEND cannot be enabled at the same time as other BLAS backends.")
+	message(FATAL_ERROR "ENABLE_GENERIC_BLAS_BACKEND cannot be enabled at the same time as other BLAS backends.")
 endif()
 
 if (ENABLE_PORTFFT_BACKEND

README.md

@@ -65,7 +65,7 @@ oneMath is part of the [UXL Foundation](http://www.uxlfoundation.org).
             <td align="center">AMD GPU</td>
         </tr>
         <tr>
-            <td align="center"><a href="https://github.com/codeplaysoftware/portBLAS"> portBLAS </a></td>
+            <td align="center"><a href="https://github.com/codeplaysoftware/portBLAS"> generic SYCL BLAS </a></td>
             <td align="center">x86 CPU, Intel GPU, NVIDIA GPU, AMD GPU, Other SYCL devices (unsupported)</td>
         </tr>
         <tr>
@@ -188,7 +188,7 @@ Supported compilers include:
             <td align="center">Dynamic, Static</td>
         </tr>
         <tr>
-            <td align="center">portBLAS</td>
+            <td align="center">generic SYCL BLAS</td>
             <td align="center">Intel DPC++</br>Open DPC++</td>
             <td align="center">Dynamic, Static</td>
         </tr>
@@ -199,7 +199,7 @@ Supported compilers include:
             <td align="center">Dynamic, Static</td>
         </tr>
         <tr>
-            <td align="center">portBLAS</td>
+            <td align="center">generic SYCL BLAS</td>
             <td align="center">Intel DPC++</br>Open DPC++</td>
             <td align="center">Dynamic, Static</td>
         </tr>
@@ -210,7 +210,7 @@ Supported compilers include:
             <td align="center">Dynamic, Static</td>
         </tr>
         <tr>
-            <td align="center">portBLAS</td>
+            <td align="center">generic SYCL BLAS</td>
             <td align="center">Open DPC++</td>
             <td align="center">Dynamic, Static</td>
         </tr>
@@ -221,13 +221,13 @@ Supported compilers include:
             <td align="center">Dynamic, Static</td>
         </tr>
         <tr>
-            <td align="center">portBLAS</td>
+            <td align="center">generic SYCL BLAS</td>
             <td align="center">Open DPC++</td>
             <td align="center">Dynamic, Static</td>
         </tr>
         <tr>
             <td rowspan=1 align="center">Other SYCL devices (unsupported)</td>
-            <td align="center">portBLAS</td>
+            <td align="center">generic SYCL BLAS</td>
             <td align="center">Intel DPC++</br>Open DPC++</td>
             <td align="center">Dynamic, Static</td>
         </tr>

docs/building_the_project_with_dpcpp.rst

@@ -59,7 +59,7 @@ or ``clang++`` and ``clang`` respectively when using the Open DPC++ Compiler.
 Backends should be enabled by setting ``-DENABLE_<BACKEND_NAME>_BACKEND=True``
 for each desired backend. By default, only the ``MKLGPU`` and ``MKLCPU``
 backends are enabled. Multiple backends for multiple device vendors can be
-enabled at once (albeit with limitations when using portBLAS and portFFT). The
+enabled at once (albeit with limitations when using onemath_sycl_blas and portFFT). The
 supported backends for the compilers are given in the table at `oneMath
 supported configurations table
 <https://github.com/uxlfoundation/oneMath?tab=readme-ov-file#supported-configurations>`_,
@@ -124,7 +124,7 @@ The most important supported build options are:
    * - ENABLE_MKLCPU_THREAD_TBB
      - True, False
      - True      
-   * - ENABLE_PORTBLAS_BACKEND
+   * - ENABLE_GENERIC_BLAS_BACKEND
      - True, False
      - False      
    * - ENABLE_PORTFFT_BACKEND
@@ -236,18 +236,18 @@ SYCL enables portable heterogeneous computing on a wide range of accelerators.
 Consequently, it is possible to use oneMath with accelerators not anticipated by
 the project.
 
-For generic SYCL devices, only portBLAS and portFFT backend are enabled.
+For generic SYCL devices, only generic BLAS and portFFT backend are enabled.
 The user must set the appropriate ``-fsycl-targets`` for their device, and also
-any other option required for performance. See `Building for portBLAS`_ and
+any other option required for performance. See `Building for oneMath generic SYCL BLAS`_ and
 `Building for portFFT`_. Extensive testing is strongly advised for these
 unsupported configurations.
 
 .. _build_for_portlibs_dpcpp:
 
-Pure SYCL backends: portBLAS and portFFT
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Pure SYCL backends: generic BLAS and portFFT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-`portBLAS <https://github.com/codeplaysoftware/portBLAS>`_ and `portFFT
+`Generic BLAS <https://github.com/codeplaysoftware/portBLAS>`_ and `portFFT
 <https://github.com/codeplaysoftware/portFFT>`_ are experimental pure-SYCL
 backends that work on all SYCL targets supported by the DPC++ compiler. Since
 they support multiple targets, they cannot be enabled with other backends in the
@@ -257,35 +257,35 @@ experimental and currently only support a subset of operations and features.
 For best performance, both libraries must be tuned. See the individual sections
 for more details.
 
-Both portBLAS and portFFT are used as header-only libraries, and will be
+Both onemath_sycl_blas and portFFT are used as header-only libraries, and will be
 downloaded automatically if not found.
 
-.. _build_for_portblas_dpcpp:
+.. _build_for_generic_blas_dpcpp:
 
-Building for portBLAS
+Building for oneMath generic SYCL BLAS
 ---------------------
 
-`portBLAS <https://github.com/codeplaysoftware/portBLAS>`_ is
-enabled by setting ``-DENABLE_PORTBLAS_BACKEND=True``.
+`onemath_sycl_blas generic BLAS <https://github.com/codeplaysoftware/portBLAS>`_ is
+enabled by setting ``-DENABLE_GENERIC_BLAS_BACKEND=True``.
 
-By default, the portBLAS backend is not tuned for any specific device.
+By default, the generic BLAS backend is not tuned for any specific device.
 This tuning is required to achieve best performance.
-portBLAS can be tuned for a specific hardware target by adding compiler
+OneMath_sycl_blas can be tuned for a specific hardware target by adding compiler
 definitions in 2 ways:
 
 #.
-  Manually specify a tuning target with ``-DPORTBLAS_TUNING_TARGET=<target>``.
-  The list of portBLAS targets can be found
+  Manually specify a tuning target with ``-DGENERIC_BLAS_TUNING_TARGET=<target>``.
+  The list of oneMath SYCL BLAS targets can be found
   `here <https://github.com/codeplaysoftware/portBLAS#cmake-options>`_.
   This will automatically set ``-fsycl-targets`` if needed.
 #.
   If one target is set via ``-fsycl-targets`` the configuration step will
-  try to automatically detect the portBLAS tuning target. One can manually
+  try to automatically detect the oneMath SYCL BLAS tuning target. One can manually
   specify ``-fsycl-targets`` via ``CMAKE_CXX_FLAGS``. See
   `DPC++ User Manual <https://intel.github.io/llvm-docs/UsersManual.html>`_
   for more information on ``-fsycl-targets``.
 
-portBLAS relies heavily on JIT compilation. This may cause time-outs on some
+OneMath SYCL BLAS relies heavily on JIT compilation. This may cause time-outs on some
 systems. To avoid this issue, use ahead-of-time compilation through tuning
 targets or ``sycl-targets``.
 
@@ -435,11 +435,11 @@ Build oneMath for the BLAS domain on a generic SYCL device:
       -DCMAKE_C_COMPILER=clang \ 
       -DENABLE_MKLCPU_BACKEND=False \ 
       -DENABLE_MKLGPU_BACKEND=False \
-      -DENABLE_PORTBLAS_BACKEND=True
+      -DENABLE_GENERIC_BLAS_BACKEND=True
 
 Note that this is not a tested configuration. This builds oneMath with the
-portBLAS backend only, for a generic SYCL device supported by the Open DPC++
-project.
+generic BLAS backend only, for a generic SYCL device supported by the
+Open DPC++ project.
 
 Build oneMath for the DFT domain on a generic SYCL device:
 

examples/blas/run_time_dispatching/level3/CMakeLists.txt

@@ -40,15 +40,15 @@ endif()
 if(ENABLE_ROCBLAS_BACKEND)
   list(APPEND DEVICE_FILTERS "hip:gpu")
 endif()
-if(ENABLE_PORTBLAS_BACKEND)
-  if(PORTBLAS_TUNING_TARGET)
-    if(PORTBLAS_TUNING_TARGET MATCHES "INTEL_CPU")
+if(ENABLE_GENERIC_BLAS_BACKEND)
+  if(GENERIC_BLAS_TUNING_TARGET)
+    if(GENERIC_BLAS_TUNING_TARGET MATCHES "INTEL_CPU")
       list(APPEND DEVICE_FILTERS "opencl:cpu")
-    elseif(PORTBLAS_TUNING_TARGET MATCHES "_GPU")
+    elseif(GENERIC_BLAS_TUNING_TARGET MATCHES "_GPU")
       list(APPEND DEVICE_FILTERS "*:gpu")
     endif()
   else()
-    # portBLAS default sycl-target is spir64, testing runtime on both supported
+    # onemath_sycl_blas default sycl-target is spir64, testing runtime on both supported
     # devices.
     list(APPEND DEVICE_FILTERS "opencl:cpu;level_zero:gpu")
   endif()

include/oneapi/math/blas.hpp

@@ -49,8 +49,8 @@
 #ifdef ONEMATH_ENABLE_NETLIB_BACKEND
 #include "oneapi/math/blas/detail/netlib/blas_ct.hpp"
 #endif
-#ifdef ONEMATH_ENABLE_PORTBLAS_BACKEND
-#include "oneapi/math/blas/detail/portblas/blas_ct.hpp"
+#ifdef ONEMATH_ENABLE_GENERIC_BLAS_BACKEND
+#include "oneapi/math/blas/detail/generic/blas_ct.hpp"
 #endif
 
 namespace oneapi {

include/oneapi/math/blas/detail/blas_ct_backends.hpp

@@ -51,7 +51,7 @@ namespace column_major {
 #define BACKEND netlib
 #include "blas_ct_backends.hxx"
 #undef BACKEND
-#define BACKEND portblas
+#define BACKEND generic
 #include "blas_ct_backends.hxx"
 #undef BACKEND
 
@@ -73,7 +73,7 @@ namespace row_major {
 #define BACKEND netlib
 #include "blas_ct_backends.hxx"
 #undef BACKEND
-#define BACKEND portblas
+#define BACKEND generic
 #include "blas_ct_backends.hxx"
 #undef BACKEND
 

include/oneapi/math/blas/detail/portblas/blas_ct.hpp → include/oneapi/math/blas/detail/generic/blas_ct.hpp

@@ -17,8 +17,8 @@
 *
 **************************************************************************/
 
-#ifndef _DETAIL_PORTBLAS_BLAS_CT_HPP_
-#define _DETAIL_PORTBLAS_BLAS_CT_HPP_
+#ifndef _DETAIL_GENERIC_BLAS_BLAS_CT_HPP_
+#define _DETAIL_GENERIC_BLAS_BLAS_CT_HPP_
 
 #if __has_include(<sycl/sycl.hpp>)
 #include <sycl/sycl.hpp>
@@ -30,7 +30,7 @@
 
 #include "oneapi/math/types.hpp"
 #include "oneapi/math/detail/backend_selector.hpp"
-#include "oneapi/math/blas/detail/portblas/onemath_blas_portblas.hpp"
+#include "oneapi/math/blas/detail/generic/onemath_blas_generic.hpp"
 #include "oneapi/math/blas/detail/blas_ct_backends.hpp"
 
 namespace oneapi {
@@ -54,4 +54,4 @@ namespace row_major {
 } //namespace math
 } //namespace oneapi
 
-#endif //_DETAIL_PORTBLAS_BLAS_CT_HPP_
+#endif //_DETAIL_GENERIC_BLAS_BLAS_CT_HPP_