Compare commits
6 Commits
5c41fb65e4
...
399447131c
| Author | SHA1 | Date | |
|---|---|---|---|
| 399447131c | |||
| da2823cf54 | |||
| 4092f968b7 | |||
| a263c0c933 | |||
| 2895fd25a3 | |||
| 8abc516b1f |
12
.github/workflows/main.yml
vendored
12
.github/workflows/main.yml
vendored
@ -36,6 +36,12 @@ jobs:
|
|||||||
cuda:
|
cuda:
|
||||||
- false
|
- false
|
||||||
- true
|
- true
|
||||||
|
exclude:
|
||||||
|
#
|
||||||
|
# nvcc needs c++14 for the cubs library
|
||||||
|
#
|
||||||
|
- cuda: true
|
||||||
|
compiler: clang5
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2.3.4
|
- uses: actions/checkout@v2.3.4
|
||||||
@ -55,7 +61,11 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir -p build/${{matrix.compiler}}
|
mkdir -p build/${{matrix.compiler}}
|
||||||
cd build/${{matrix.compiler}}
|
cd build/${{matrix.compiler}}
|
||||||
$WITH_SHELL '../../configure'
|
if [[ ${{matrix.cuda}} == true ]]; then
|
||||||
|
$WITH_SHELL '../../configure --enable-cuda'
|
||||||
|
else
|
||||||
|
$WITH_SHELL '../../configure'
|
||||||
|
fi
|
||||||
|
|
||||||
- name: CTF (${{matrix.compiler}})
|
- name: CTF (${{matrix.compiler}})
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@ -25,7 +25,7 @@ AM_CXXFLAGS = $(CUDA_CXXFLAGS)
|
|||||||
AM_LDFLAGS += $(CUDA_LDFLAGS)
|
AM_LDFLAGS += $(CUDA_LDFLAGS)
|
||||||
|
|
||||||
bin_PROGRAMS += test-cublas-parallel-atrip
|
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
|
bin_PROGRAMS += test-cuda-sanity
|
||||||
test_cuda_sanity_SOURCES = test-cuda-sanity.cxx
|
test_cuda_sanity_SOURCES = test-cuda-sanity.cxx
|
||||||
|
|||||||
@ -13,7 +13,8 @@ let
|
|||||||
);
|
);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
myopenblas = pkgs.enableDebugging pkgs.openblas;
|
#myopenblas = pkgs.enableDebugging pkgs.openblas;
|
||||||
|
myopenblas = pkgs.openblas;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|||||||
@ -52,11 +52,13 @@ namespace atrip {
|
|||||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||||
template <typename T>
|
template <typename T>
|
||||||
std::string pretty_print(T&& value) {
|
std::string pretty_print(T&& value) {
|
||||||
std::stringstream stream;
|
|
||||||
#if ATRIP_DEBUG > 2
|
#if ATRIP_DEBUG > 2
|
||||||
|
std::stringstream stream;
|
||||||
dbg::pretty_print(stream, std::forward<T>(value));
|
dbg::pretty_print(stream, std::forward<T>(value));
|
||||||
#endif
|
|
||||||
return stream.str();
|
return stream.str();
|
||||||
|
#else
|
||||||
|
return "";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
// Pretty printing:1 ends here
|
// Pretty printing:1 ends here
|
||||||
|
|||||||
@ -16,7 +16,7 @@ libatrip_a_CPPFLAGS += $(CUDA_CXXFLAGS)
|
|||||||
libatrip_a_DEPENDENCIES = $(NVCC_OBJS)
|
libatrip_a_DEPENDENCIES = $(NVCC_OBJS)
|
||||||
libatrip_a_LIBADD = $(NVCC_OBJS)
|
libatrip_a_LIBADD = $(NVCC_OBJS)
|
||||||
%.nvcc.o: %.cxx
|
%.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
|
#./atrip/Equations.o: ./atrip/Equations.cxx
|
||||||
# $(NVCC) -c -I../ $(CPPFLAGS) $(libatrip_a_CPPFLAGS) $< -o $@
|
# $(NVCC) -c -I../ $(CPPFLAGS) $(libatrip_a_CPPFLAGS) $< -o $@
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user