.github/workflows/main.yml

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

bench/Makefile.am

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

etc/nix/openblas.nix

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

include/atrip/Utils.hpp

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

src/Makefile.am

@@ -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 -ccbin="${MPICXX}" -I../ $(CPPFLAGS) $(CTF_CPPFLAGS) $(DEFS) $(libatrip_a_CPPFLAGS) $< -o $@
+	$(NVCC) -c -x cu -I../ $(CPPFLAGS) $(CTF_CPPFLAGS) $(DEFS) $(libatrip_a_CPPFLAGS) $< -o $@
 
 #./atrip/Equations.o: ./atrip/Equations.cxx
 #	$(NVCC) -c -I../ $(CPPFLAGS) $(libatrip_a_CPPFLAGS) $< -o $@