👷 update macos spec.

cda-tum · Mar 21, 2024 · 494225c · 494225c
1 parent ce07701
commit 494225c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -29,24 +29,29 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [ macos-11, macos-12 ]
-        compiler: [ g++-11, g++-12, clang++ ]
+        os: [ macos-12, macos-13, macos-14 ]
+        compiler: [ g++-11, g++-12, g++-13, clang++ ]
         build_type: [ Debug, Release ]
         include:
+          - os: macos-12
+            architecture: x64
+          - os: macos-13
+            architecture: x64
+          - os: macos-14
+            architecture: arm64
           - compiler: clang++
             ccompiler: clang
           - compiler: g++-11
             ccompiler: gcc-11
           - compiler: g++-12
             ccompiler: gcc-12
-          - os: macos-11
-            compiler: g++-10
-            ccompiler: gcc-10
-            build_type: Debug
-          - os: macos-11
-            compiler: g++-10
-            ccompiler: gcc-10
-            build_type: Release
+        exclude:
+          - os: macos-14
+            compiler: g++-11
+          - os: macos-14
+            compiler: g++-12
+          - os: macos-14
+            compiler: g++-13
 
     name: ${{matrix.os}} with ${{matrix.compiler}} (${{matrix.build_type}} mode)
     runs-on: ${{matrix.os}}

diff --git a/include/siqad_plugin_interface.hpp b/include/siqad_plugin_interface.hpp
@@ -154,12 +154,12 @@ class siqad_plugin_interface
         logger log(log_level);
 
         // grab all physical locations
-        log.debug() << "Grab all physical locations..." << std::endl;
+        log.debug() << "Grab all physical locations..." << '\n';
 
         auto* const db_collection = sqconn->dbCollection();
 
         std::vector<std::pair<double, double>> db_locs{};
-        db_locs.reserve(db_collection->db_tree_inner->size());
+        db_locs.reserve(static_cast<uint64_t>(static_cast<double>(db_collection->db_tree_inner->size())));
 
         for (const auto& db : *db_collection)
         {
@@ -181,7 +181,7 @@ class siqad_plugin_interface
                 fiction::round_to_n_decimal_places(std::stod(sqconn->getParameter("eps_r")), 2);  // round to two digits
             params.lambda_tf = std::stod(sqconn->getParameter("debye_length"));
 
-            auto_fail = std::stoi(sqconn->getParameter("autofail"));
+            auto_fail = static_cast<uint64_t>(std::stoi(sqconn->getParameter("autofail")));
 
             if (simulation_engine == fiction::sidb_simulation_engine::QUICKEXACT)
             {
@@ -212,11 +212,11 @@ class siqad_plugin_interface
                     quicksim_params.number_threads = static_cast<uint64_t>(number_threads);
                 }
             }
-            log.echo() << "Retrieval from SiQADConn complete." << std::endl;
+            log.echo() << "Retrieval from SiQADConn complete." << '\n';
         }
         catch (...)
         {
-            log.critical() << "Could not retrieve all parameters from SiQADConn." << std::endl;
+            log.critical() << "Could not retrieve all parameters from SiQADConn." << '\n';
             throw;
         }
     }