testing platform hardware detection made macos compliant, minor code cleanup

Author: AlePalu

fdaPDE/src/io/parsing.h

@@ -67,8 +67,8 @@ template <typename CharT> struct token_stream {
         using pointer = std::add_pointer_t<value_t>;
 
         line_iterator() noexcept = default;
-        line_iterator(buff_t buff, size_t buff_sz, size_t begin, size_t end, char sep) :
-            buff_(buff), sep_(sep), token_sz_(0), buff_sz_(buff_sz), begin_(begin), end_(end), pos_(0) {
+        line_iterator(buff_t buff, size_t begin, size_t end, char sep) :
+            buff_(buff), sep_(sep), token_sz_(0), begin_(begin), end_(end), pos_(0) {
             fetch_token_();
         }
         bool has_token() const { return has_token_; }
@@ -105,7 +105,7 @@ template <typename CharT> struct token_stream {
         value_t token_;
         const buff_t buff_ = nullptr;
         char sep_;
-        size_t token_sz_, buff_sz_;
+        size_t token_sz_;
         size_t begin_, end_, pos_;
         mutable bool has_token_ = true;
     };
@@ -114,7 +114,7 @@ template <typename CharT> struct token_stream {
         head_ = tail_;
         tail_ = tail_ + next_char_(buff_, head_, buff_sz_, '\n');
         if (tail_ < buff_sz_) { tail_++; }
-        return line_iterator {buff_, buff_sz_, head_, tail_, sep_};
+        return line_iterator {buff_, head_, tail_, sep_};
     }
     bool has_line() const { return head_ < buff_sz_; }
     operator bool() const { return head_ < buff_sz_; }

tests/run_tests.sh

@@ -65,10 +65,27 @@ fi
 COMPILER_VERSION=$("$CC" --version | head -n1)
 CMAKE_VERSION=$(cmake --version | head -n1)
 
+# detect operating system
+OSTYPE="$(uname)"
+
 # detect hardware
-CPU_MODEL=$(lscpu | grep -m1 "Model name:" | cut -d: -f2- | sed 's/^ *//')
-NTHREADS=$(nproc)
-THREADS_PER_CORE=$(lscpu | grep -m1 "Thread(s) per core:" | cut -d: -f2 | tr -d ' ')
+case "$OSTYPE" in
+    Linux)
+	CPU_MODEL=$(lscpu | awk -F: '/Model name/ {sub(/^[ \t]+/, "", $2); print $2; exit}')
+	NTHREADS=$(nproc)
+	THREADS_PER_CORE=$(lscpu | awk -F: '/Thread\(s\) per core/ {gsub(/ /,"",$2); print $2; exit}')
+	;;
+    Darwin)
+	CPU_MODEL=$(sysctl -n machdep.cpu.brand_string)
+	NTHREADS=$(sysctl -n hw.logicalcpu)
+	THREADS_PER_CORE=$(( $(sysctl -n hw.logicalcpu) / $(sysctl -n hw.physicalcpu) ))
+	;;
+    *)
+	CPU_MODEL="NA"
+	NTHREADS="NA"
+	THREADS_PER_CORE="NA"
+    ;;
+esac
 
 echo "=============================================="
 echo "   fdaPDE testing framework"