Merge pull request #97 from LLNL/faster-compile

faster compile
LLNL · Feb 23, 2022 · b442bf3 · b442bf3
2 parents fef85a6 + 7013270
commit b442bf3
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 53 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,7 +59,7 @@ foreach (backend ${camp_backends})
   if ("${ENABLE_${suffix}}")
     set ("CAMP_ENABLE_${suffix}" On)
   endif()
-  if ("CAMP_ENABLE_${suffix}")
+  if (${CAMP_ENABLE_${suffix}})
     if (backend IN_LIST camp_runtime_backends)
       set (backend ${backend}_runtime)  
     endif()
@@ -103,9 +103,10 @@ configure_file(${PROJECT_SOURCE_DIR}/include/camp/config.in.hpp
 blt_add_library (
   NAME camp
   HEADERS ${camp_headers}
+  SOURCES ./src/errors.cpp
   DEPENDS_ON ${camp_depends}
   )
-target_include_directories (camp INTERFACE
+target_include_directories (camp PUBLIC
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
   $<INSTALL_INTERFACE:include>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -35,7 +35,7 @@ jobs:
   - task: CMake@1
     inputs:
       workingDir: 'build'
-      cmakeArgs: '--build . --config Release --verbose'
+      cmakeArgs: '--build . --config Release --verbose --parallel $(parallel)'
   - task: CmdLine@2
     inputs:
       script: 'ctest.exe -T test -C Release'

diff --git a/include/camp/camp.hpp b/include/camp/camp.hpp
@@ -11,7 +11,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 #ifndef __CAMP_HPP
 #define __CAMP_HPP
 
-#include <array>
 #include <type_traits>
 
 #include <camp/defines.hpp>

diff --git a/include/camp/defines.hpp b/include/camp/defines.hpp
@@ -13,8 +13,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 
 #include <cstddef>
 #include <cstdint>
-#include <stdexcept>
-#include <string>
 
 #include <camp/config.hpp>
 
@@ -178,30 +176,17 @@ using nullptr_t = decltype(nullptr);
     using type = typename X<Lambda::template expr, Rest...>::type; \
   }
 
+/// Throw a runtime_error, avoid including exception everywhere
+void throw_re(const char *s);
 
 #ifdef CAMP_ENABLE_CUDA
 
 #define campCudaErrchk(ans) ::camp::cudaAssert((ans), #ans, __FILE__, __LINE__)
 
-inline cudaError_t cudaAssert(cudaError_t code,
+cudaError_t cudaAssert(cudaError_t code,
                               const char *call,
                               const char *file,
-                              int line)
-{
-  if (code != cudaSuccess && code != cudaErrorNotReady) {
-    std::string msg;
-    msg += "campCudaErrchk(";
-    msg += call;
-    msg += ") ";
-    msg += cudaGetErrorString(code);
-    msg += " ";
-    msg += file;
-    msg += ":";
-    msg += std::to_string(line);
-    throw std::runtime_error(msg);
-  }
-  return code;
-}
+                              int line);
 
 #endif  //#ifdef CAMP_ENABLE_CUDA
 
@@ -210,25 +195,10 @@ inline cudaError_t cudaAssert(cudaError_t code,
 
 #define campHipErrchk(ans) ::camp::hipAssert((ans), #ans, __FILE__, __LINE__)
 
-inline hipError_t hipAssert(hipError_t code,
+hipError_t hipAssert(hipError_t code,
                             const char *call,
                             const char *file,
-                            int line)
-{
-  if (code != hipSuccess && code != hipErrorNotReady) {
-    std::string msg;
-    msg += "campHipErrchk(";
-    msg += call;
-    msg += ") ";
-    msg += hipGetErrorString(code);
-    msg += " ";
-    msg += file;
-    msg += ":";
-    msg += std::to_string(line);
-    throw std::runtime_error(msg);
-  }
-  return code;
-}
+                            int line);
 
 #endif  //#ifdef CAMP_ENABLE_HIP
 

diff --git a/include/camp/helpers.hpp b/include/camp/helpers.hpp
@@ -12,7 +12,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 #define CAMP_HELPERS_HPP
 
 #include <cstddef>
-#include <iterator>
 #include <utility>
 
 #include "camp/defines.hpp"

diff --git a/include/camp/number.hpp b/include/camp/number.hpp
@@ -17,7 +17,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 
 #include "camp/defines.hpp"
 
-#include <array>
 #include <type_traits>
 
 namespace camp

diff --git a/include/camp/resource/cuda.hpp b/include/camp/resource/cuda.hpp
@@ -19,8 +19,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 
 #include <cuda_runtime.h>
 
-#include <exception>
-
 namespace camp
 {
 namespace resources
@@ -125,7 +123,7 @@ namespace resources
               return MemoryAccess::Managed;
           }
         }
-        throw std::runtime_error("invalid pointer detected");
+        ::camp::throw_re("invalid pointer detected");
       }
     public:
       Cuda(int group = -1, int dev = 0)
@@ -232,7 +230,7 @@ namespace resources
             campCudaErrchk(cudaFree(p));
             break;
           case MemoryAccess::Unknown:
-            throw std::runtime_error("Unknown memory access type, cannot free");
+            ::camp::throw_re("Unknown memory access type, cannot free");
         }
       }
       void memcpy(void *dst, const void *src, size_t size)

diff --git a/include/camp/resource/event.hpp b/include/camp/resource/event.hpp
@@ -12,7 +12,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 #define __CAMP_EVENT_HPP
 
 #include<type_traits>
-#include<exception>
 #include<memory>
 
 namespace camp
@@ -60,7 +59,7 @@ namespace resources
       {
         auto result = dynamic_cast<EventModel<T> *>(m_value.get());
         if (result == nullptr) {
-          throw std::runtime_error("Incompatible Event type get cast.");
+          ::camp::throw_re("Incompatible Event type get cast.");
         }
         return *result->get();
       }

diff --git a/include/camp/resource/hip.hpp b/include/camp/resource/hip.hpp
@@ -17,8 +17,6 @@ For details about use and distribution, please read LICENSE and NOTICE from
 #ifdef CAMP_ENABLE_HIP
 #include <hip/hip_runtime.h>
 
-#include <exception>
-
 namespace camp
 {
 namespace resources
@@ -122,7 +120,9 @@ namespace resources
               return MemoryAccess::Unknown;
           }
         }
-        throw std::runtime_error("invalid pointer detected");
+        ::camp::throw_re("invalid pointer detected");
+        // unreachable
+        return MemoryAccess::Unknown;
       }
 
     public:
@@ -229,7 +229,7 @@ namespace resources
             campHipErrchk(hipFree(p));
             break;
           case MemoryAccess::Unknown:
-            throw std::runtime_error("Unknown memory access type, cannot free");
+            ::camp::throw_re("Unknown memory access type, cannot free");
             break;
         }
       }

diff --git a/include/camp/resource/sycl.hpp b/include/camp/resource/sycl.hpp
@@ -18,6 +18,7 @@ For details about use and distribution, please read LICENSE and NOTICE from
 #ifdef CAMP_ENABLE_SYCL
 #include <CL/sycl.hpp>
 #include <map>
+#include <array>
 using namespace cl;
 
 namespace camp

diff --git a/include/camp/tuple.hpp b/include/camp/tuple.hpp
@@ -17,7 +17,7 @@ For details about use and distribution, please read LICENSE and NOTICE from
  * \brief   Exceptionally basic tuple for host-device support
  */
 
-#include <iostream>
+#include <sstream>
 #include <type_traits>
 
 #include "camp/concepts.hpp"

diff --git a/src/errors.cpp b/src/errors.cpp
@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2016-18, Lawrence Livermore National Security, LLC.
+Produced at the Lawrence Livermore National Laboratory
+Maintained by Tom Scogland <[email protected]>
+CODE-756261, All rights reserved.
+This file is part of camp.
+For details about use and distribution, please read LICENSE and NOTICE from
+http://github.com/llnl/camp
+*/
+
+#include <camp/camp.hpp>
+#include <stdexcept>
+#include <string>
+#include <exception>
+
+
+namespace camp
+{
+
+void throw_re(const char *s) { throw std::runtime_error(s); }
+
+#ifdef CAMP_ENABLE_CUDA
+
+
+cudaError_t cudaAssert(cudaError_t code,
+                              const char *call,
+                              const char *file,
+                              int line)
+{
+  if (code != cudaSuccess && code != cudaErrorNotReady) {
+    std::string msg;
+    msg += "campCudaErrchk(";
+    msg += call;
+    msg += ") ";
+    msg += cudaGetErrorString(code);
+    msg += " ";
+    msg += file;
+    msg += ":";
+    msg += std::to_string(line);
+    throw std::runtime_error(msg);
+  }
+  return code;
+}
+
+#endif  //#ifdef CAMP_ENABLE_CUDA
+
+#ifdef CAMP_ENABLE_HIP
+
+hipError_t hipAssert(hipError_t code,
+                            const char *call,
+                            const char *file,
+                            int line)
+{
+  if (code != hipSuccess && code != hipErrorNotReady) {
+    std::string msg;
+    msg += "campHipErrchk(";
+    msg += call;
+    msg += ") ";
+    msg += hipGetErrorString(code);
+    msg += " ";
+    msg += file;
+    msg += ":";
+    msg += std::to_string(line);
+    throw std::runtime_error(msg);
+  }
+  return code;
+}
+
+#endif  //#ifdef CAMP_ENABLE_HIP
+
+}  // namespace camp