Merge updated version output

Adds DPCPP to the version output and improves alignment of the different lines.

Related PR: #806

contributors.txt

@@ -4,6 +4,7 @@ license, as specified in the repository's LICENSE file.
 Aliaga José I. <aliaga@uji.es> Universitat Jaume I
 Anzt Hartwig <hartwig.anzt@kit.edu> Karlsruhe Institute of Technology, The University of Tennessee Knoxville
 Boman Erik <egboman@sandia.gov> Sandia National Laboratories
+Castelli Fabian <fabian.castelli@kit.edu> Karlsruhe Institute of Technology
 Chen Yenchen <yanjen224@gmail.com> National Taiwan University
 Cojean Terry <terry.cojean@kit.edu> Karlsruhe Institute of Technology
 Drzaic Jelena <jelena.drzaic1@gmail.com> University of Zagreb

core/base/version.cpp

@@ -64,8 +64,10 @@ std::ostream &operator<<(std::ostream &os, const version_info &ver_info)
     print_version(os, ver_info.omp_version);
     os << "\n    the CUDA      module is  ";
     print_version(os, ver_info.cuda_version);
-    os << "\n    the HIP      module is  ";
+    os << "\n    the HIP       module is  ";
     print_version(os, ver_info.hip_version);
+    os << "\n    the DPCPP     module is  ";
+    print_version(os, ver_info.dpcpp_version);
     return os;
 }
 

examples/CMakeLists.txt

@@ -59,7 +59,7 @@ if(GINKGO_RUN_EXAMPLES)
             COMMAND chmod +x ${example_path}/target-wrapper.sh && ${example_path}/target-wrapper.sh > ${example_path}/${example}.out
             WORKING_DIRECTORY ${example_path})
         file(WRITE ${example_path}/diff-command "#!/bin/bash
-diff <(sed -n '7,$p' ${example_path}/${example}.out | sed -E 's/([^a-z,\":\\s\\)\\(\\{\\}_]+)//g') <(sed -n '6,$p' ${CMAKE_SOURCE_DIR}/examples/${example}/doc/results.dox | head -n -4 | sed -E 's/([^a-z,\":\\s\\)\\(\\{\\}_]+)//g')")
+diff <(sed -n '8,$p' ${example_path}/${example}.out | sed -E 's/([^a-z,\":\\s\\)\\(\\{\\}_]+)//g') <(sed -n '6,$p' ${CMAKE_SOURCE_DIR}/examples/${example}/doc/results.dox | head -n -4 | sed -E 's/([^a-z,\":\\s\\)\\(\\{\\}_]+)//g')")
         add_custom_target("validate-${example}"
             COMMAND chmod +x ${example_path}/diff-command && ${example_path}/diff-command
             WORKING_DIRECTORY ${example_path})

include/ginkgo/core/base/version.hpp

@@ -154,7 +154,7 @@ inline std::ostream &operator<<(std::ostream &os, const version &ver)
  *     earlier version may have this implemented or fixed in a later version).
  *
  * This structure provides versions of different parts of Ginkgo: the headers,
- * the core and the kernel modules (reference, OpenMP, CUDA, HIP).
+ * the core and the kernel modules (reference, OpenMP, CUDA, HIP, DPCPP).
  * To obtain an instance of version_info filled with information about the
  * current version of Ginkgo, call the version_info::get() static method.
  */