Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version output #806

Merged
merged 4 commits into from Jun 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions contributors.txt
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion core/base/version.cpp
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion include/ginkgo/core/base/version.hpp
Expand Up @@ -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.
*/
Expand Down