Compare commits

...

6 Commits

Author SHA1 Message Date
399447131c Exclude clang5 from the nvidia compilation 2022-09-14 14:52:27 +02:00
da2823cf54 Exclude (gcc, cuda) from matrix 2022-09-14 14:43:38 +02:00
4092f968b7 Tell nvcc to use the correct MPICXX binary
There was a bug related to

  https://gcc.gnu.org/pipermail/gcc-help/2021-June/140490.html

where nvcc was getting other versions of the gcc compiler
and the libstd++ version were mismatched, resulting in linking errors.
2022-09-14 13:28:15 +02:00
a263c0c933 Fix cuda bench 2022-09-13 15:14:45 +02:00
2895fd25a3 Disable debug in openblas 2022-09-13 15:00:06 +02:00
8abc516b1f Use --enable-cuda flag in workflows 2022-09-13 14:51:49 +02:00
5 changed files with 19 additions and 6 deletions

View File

@ -36,6 +36,12 @@ jobs:
cuda:
- false
- true
exclude:
#
# nvcc needs c++14 for the cubs library
#
- cuda: true
compiler: clang5
steps:
- uses: actions/checkout@v2.3.4
@ -55,7 +61,11 @@ jobs:
run: |
mkdir -p build/${{matrix.compiler}}
cd build/${{matrix.compiler}}
if [[ ${{matrix.cuda}} == true ]]; then
$WITH_SHELL '../../configure --enable-cuda'
else
$WITH_SHELL '../../configure'
fi
- name: CTF (${{matrix.compiler}})
run: |

View File

@ -25,7 +25,7 @@ AM_CXXFLAGS = $(CUDA_CXXFLAGS)
AM_LDFLAGS += $(CUDA_LDFLAGS)
bin_PROGRAMS += test-cublas-parallel-atrip
test_cublas_parallel_SOURCES = test-cublas-parallel-atrip.cxx
test_cublas_parallel_atrip_SOURCES = test-cublas-parallel-atrip.cxx
bin_PROGRAMS += test-cuda-sanity
test_cuda_sanity_SOURCES = test-cuda-sanity.cxx

View File

@ -13,7 +13,8 @@ let
);
*/
myopenblas = pkgs.enableDebugging pkgs.openblas;
#myopenblas = pkgs.enableDebugging pkgs.openblas;
myopenblas = pkgs.openblas;
in

View File

@ -52,11 +52,13 @@ namespace atrip {
#pragma GCC diagnostic ignored "-Wunused-parameter"
template <typename T>
std::string pretty_print(T&& value) {
std::stringstream stream;
#if ATRIP_DEBUG > 2
std::stringstream stream;
dbg::pretty_print(stream, std::forward<T>(value));
#endif
return stream.str();
#else
return "";
#endif
}
#pragma GCC diagnostic pop
// Pretty printing:1 ends here

View File

@ -16,7 +16,7 @@ libatrip_a_CPPFLAGS += $(CUDA_CXXFLAGS)
libatrip_a_DEPENDENCIES = $(NVCC_OBJS)
libatrip_a_LIBADD = $(NVCC_OBJS)
%.nvcc.o: %.cxx
$(NVCC) -c -x cu -I../ $(CPPFLAGS) $(CTF_CPPFLAGS) $(DEFS) $(libatrip_a_CPPFLAGS) $< -o $@
$(NVCC) -c -x cu -ccbin="${MPICXX}" -I../ $(CPPFLAGS) $(CTF_CPPFLAGS) $(DEFS) $(libatrip_a_CPPFLAGS) $< -o $@
#./atrip/Equations.o: ./atrip/Equations.cxx
# $(NVCC) -c -I../ $(CPPFLAGS) $(libatrip_a_CPPFLAGS) $< -o $@