moved [ERROR]

particle_structs/src/cabm/cabm.hpp

@@ -375,7 +375,7 @@ namespace pumipic {
   template <class MSpace>
   typename CabM<DataTypes, MemSpace>::template Mirror<MSpace>* CabM<DataTypes, MemSpace>::copy() {
     if (std::is_same<memory_space, typename MSpace::memory_space>::value) {
-      printError( "[ERROR] Copy to same memory space not supported\n");
+      printError("Copy to same memory space not supported\n");
       exit(EXIT_FAILURE);
     }
     Mirror<MSpace>* mirror_copy = new CabM<DataTypes, MSpace>();
@@ -478,7 +478,7 @@ namespace pumipic {
     Mirror<MSpace>* copy() {reportError(); return NULL;}
 
   private:
-    void reportError() const {printError( "[ERROR] pumi-pic was built "
+    void reportError() const {printError( "pumi-pic was built "
                                       "without Cabana so the CabM structure "
                                       "can not be used\n");}
   };

particle_structs/src/csr/CSR.hpp

@@ -269,7 +269,7 @@ namespace pumipic {
   template <class MSpace>
   typename CSR<DataTypes, MemSpace>::template Mirror<MSpace>* CSR<DataTypes, MemSpace>::copy() {
     if (std::is_same<memory_space, typename MSpace::memory_space>::value) {
-      printError( "[ERROR] Copy to same memory space not supported\n");
+      printError( "Copy to same memory space not supported\n");
       exit(EXIT_FAILURE);
     }
     Mirror<MSpace>* mirror_copy = new CSR<DataTypes, MSpace>();

particle_structs/src/dps/dps.hpp

@@ -242,7 +242,7 @@ namespace pumipic {
   template <class MSpace>
   typename DPS<DataTypes, MemSpace>::template Mirror<MSpace>* DPS<DataTypes, MemSpace>::copy() {
     if (std::is_same<memory_space, typename MSpace::memory_space>::value) {
-      printError( "[ERROR] Copy to same memory space not supported\n");
+      printError( "Copy to same memory space not supported\n");
       exit(EXIT_FAILURE);
     }
     Mirror<MSpace>* mirror_copy = new DPS<DataTypes, MSpace>();
@@ -410,7 +410,7 @@ namespace pumipic {
     Mirror<MSpace>* copy() {reportError(); return NULL;}
 
   private:
-    void reportError() const {printError( "[ERROR] pumi-pic was built "
+    void reportError() const {printError( "pumi-pic was built "
                                       "without Cabana so the DPS structure "
                                       "can not be used\n");}
   };

particle_structs/src/ps_for.hpp

@@ -25,7 +25,7 @@ namespace pumipic {
       dps->parallel_for(fn, s);
       return;
     }
-    printError( "[ERROR] Structure does not support parallel for used on kernel %s\n",
+    printError("Structure does not support parallel for used on kernel %s\n",
             s.c_str());
     throw 1;
   }
@@ -49,7 +49,7 @@ namespace pumipic {
       return dps->template copy<MSpace>();
     }
 
-    printError( "[ERROR] Structure does not support copy\n");
+    printError("Structure does not support copy\n");
     throw 1;
     return NULL;
   }

particle_structs/src/scs/SCS_rebuild.h

@@ -145,7 +145,7 @@ namespace pumipic {
     });
     auto hasInactivePtcls_h = deviceToHost(hasInactivePtcls);
     if( hasInactivePtcls_h(0) ) {
-      printError( "[ERROR] there are new particles being added that are marked"
+      printError( "there are new particles being added that are marked"
                       "as inactive (element id set to -1)\n");
       exit(EXIT_FAILURE);
     }

particle_structs/src/scs/SellCSigma.h

@@ -337,7 +337,7 @@ template<class DataTypes, typename MemSpace>
 template <class MSpace>
 typename SellCSigma<DataTypes, MemSpace>::template Mirror<MSpace>* SellCSigma<DataTypes, MemSpace>::copy() {
   if (std::is_same<memory_space, typename MSpace::memory_space>::value) {
-    printError( "[ERROR] Copy to same memory space not supported\n");
+    printError("Copy to same memory space not supported\n");
     exit(EXIT_FAILURE);
   }
   const auto cmax = maxChunk<MSpace>(C_max);

particle_structs/src/support/MemberTypeLibraries.h

@@ -163,7 +163,7 @@ namespace pumipic {
       });
       auto hasFailed_h = deviceToHost(hasFailed);
       if( hasFailed_h(0) ) {
-	printError( "[ERROR] index out of range in view-to-view copy\n");
+	printError("index out of range in view-to-view copy\n");
 	exit(EXIT_FAILURE);
       }
       CopyViewsToViewsImpl<View, Types...>(dsts+1, srcs+1, ps_indices);

src/pumipic_file.cpp

@@ -51,7 +51,7 @@ namespace pumipic {
     if (comm->rank() == 0) {
       if (!Omega_h::filesystem::exists(dir)) {
         if (!Omega_h::filesystem::create_directory(dir)) {
-          printError( "[ERROR] Failed to create directory %s\n", dir);
+          printError("Failed to create directory %s\n", dir);
           return;
         }
       }
@@ -70,7 +70,7 @@ namespace pumipic {
     //Write file for the pumipic mesh data
     std::ofstream out_str(ppm_file);
     if (!out_str) {
-      printError( "[ERROR] Failed to open file %s\n", ppm_file);
+      printError("Failed to open file %s\n", ppm_file);
       return;
     }
 #ifdef OMEGA_H_USE_ZLIB
@@ -122,7 +122,7 @@ namespace pumipic {
     sprintf(dir, "%s_%d.ppm", path, comm->size());
 
     if (!Omega_h::filesystem::exists(dir)) {
-      printError( "[ERROR] Directory %s does not exist\n", dir);
+      printError("Directory %s does not exist\n", dir);
       return;
     }
 
@@ -136,7 +136,7 @@ namespace pumipic {
 
     std::ifstream in_str(ppm_file);
     if (!in_str) {
-      printError( "[ERROR] Cannot open file %s\n", ppm_file);
+      printError("Cannot open file %s\n", ppm_file);
       return;
     }
 

src/pumipic_input.cpp

@@ -37,7 +37,7 @@ namespace pumipic {
       while (dot >=0 && partition_filename[dot] != '.')
         --dot;
       if (dot < 0) {
-        printError( "[ERROR] Filename provided has no extension (%s)", partition_filename);
+        printError("Filename provided has no extension (%s)", partition_filename);
         throw std::runtime_error("Filename has no extension");
       }
       char* extension = partition_filename + dot + 1;
@@ -88,7 +88,7 @@ namespace pumipic {
 
       }
       else {
-        printError( "[ERROR] Only .ptn and .cpn partitions are supported");
+        printError("Only .ptn and .cpn partitions are supported");
         throw std::runtime_error("Invalid partition file extension");
       }
     }

support/CMakeLists.txt

@@ -36,10 +36,12 @@ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/support>
 $<INSTALL_INTERFACE:include>)
 
 if(PUMIPIC_PRINT_ENABLED)
+  add_definitions(-DPUMIPIC_PRINT_ENABLED)
   target_compile_definitions(support INTERFACE -DPUMIPIC_PRINT_ENABLED)
 endif()
 
 if (spdlog_FOUND)
+  add_definitions(-DPUMIPIC_SPDLOG_ENABLED)
   target_compile_definitions(support INTERFACE -DPUMIPIC_SPDLOG_ENABLED)
   target_link_libraries(support PUBLIC spdlog::spdlog)
 endif()

support/ppPrint.h

@@ -29,11 +29,11 @@ namespace pumipic {
   }
 
   template<typename... Args>
-  void printError(const char* fmt, const Args&... args) {
+  void printError(std::string fmt, const Args&... args) {
     #if defined(PUMIPIC_SPDLOG_ENABLED) && defined(PUMIPIC_PRINT_ENABLED)
       spdlog::error("{}", fmt::sprintf(fmt, args...));
     #elif defined(PUMIPIC_PRINT_ENABLED)
-      fprintf(pp_stderr, fmt, args...);
+      fprintf(pp_stderr, ("[ERROR]"+fmt).c_str(), args...);
     #endif
   }
 

support/ppTiming.cpp

@@ -37,22 +37,22 @@ namespace pumipic {
 
   void SetTimingVerbosity(int v) {
     if (time_per_op.size() > 0) {
-      printError( "[ERROR] Cannot change timing verbosity after first call to RecordTime\n");
+      printError("Cannot change timing verbosity after first call to RecordTime\n");
       return;
     }
     verbosity = v;
   }
 
   void EnableTiming() {
     if (time_per_op.size() > 0) {
-      printError( "[ERROR] Cannot enable timing after first call to RecordTime\n");
+      printError("Cannot enable timing after first call to RecordTime\n");
       return;
     }
     enable_timing = 1;
   }
   void DisableTiming() {
     if (time_per_op.size() > 0) {
-      printError( "[ERROR] Cannot disable timing after first call to RecordTime\n");
+      printError("Cannot disable timing after first call to RecordTime\n");
       return;
     }
     enable_timing = -1;