Merge branch 'main' of github.com:swift-nav/console_pp into john-michaelburke/realtime

john-michaelburke · john-michaelburke · commit a8182ea65cc7 · 2021-04-29T13:20:12.000-07:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,6 +15,7 @@ jobs:
     name: Backend Benchmarks
 
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-20.04
@@ -45,19 +46,20 @@ jobs:
           & "C:\\Program Files\\Git\\bin\\sh.exe" -c "echo '${{ secrets.SSH_KEY }}' >> ~/.ssh/id_rsa"
         if: matrix.os == 'windows-2019'
 
-      - name: Install LLVM and Clang
+      - name: Install LLVM and Clang (Windows)
         uses: KyleMayes/install-llvm-action@v1
         with:
           version: "10.0"
           directory: ${{ runner.temp }}/llvm
+        if: matrix.os == 'windows-2019'
 
       - name: Install ${{ runner.os }} Dependencies.
         shell: bash
         run: |
           if [ "$RUNNER_OS" == "Linux" ]; then
               sudo apt-get install -y capnproto git-lfs libudev-dev
           elif [ "$RUNNER_OS" == "macOS" ]; then
-              brew install capnp git-lfs
+              brew install capnp llvm
           elif [ "$RUNNER_OS" == "Windows" ]; then
               choco install -y capnproto git-lfs
           fi
@@ -82,21 +84,57 @@ jobs:
           activate-environment: console_pp
           environment-file: conda.yml
 
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Caches/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'macos-10.15'
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/AppData/Local/pip/Cache
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'windows-2019'
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'ubuntu-20.04'
+
       - name: Run Pip Install
         run: |
           cargo make pip-install-dev
-      
-      - name: Run Backend Benchmarks
+
+      - name: Run Backend Benchmarks (Windows)
         env:
           LIBCLANG_PATH: ${{ runner.temp }}/llvm/bin
         run: |
           cargo make backend-benches
+        if: matrix.os == 'windows-2019'
+      
+      - name: Run Backend Benchmarks
+        run: |
+          cargo make backend-benches
+        if: matrix.os != 'windows-2019'
 
   checks:
 
     name: Code Quality Checks
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
 
@@ -141,6 +179,16 @@ jobs:
           cargo make poetry-export
           git diff --exit-code
 
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'ubuntu-20.04'
+
       - name: Run Pip Install
         run: |
           cargo make pip-install-dev
@@ -200,25 +248,25 @@ jobs:
           & "C:\\Program Files\\Git\\bin\\sh.exe" -c "echo '${{ secrets.SSH_KEY }}' >> ~/.ssh/id_rsa"
         if: matrix.os == 'windows-2019'
 
-      - name: Install LLVM and Clang for Windows
-        uses: KyleMayes/install-llvm-action@v1
-        with:
-          version: "10.0"
-          directory: ${{ runner.temp }}/llvm
-        if: matrix.os == 'windows-2019'
-
       - name: Install ${{ runner.os }} Dependencies.
         shell: bash
         run: |
           if [ "$RUNNER_OS" == "Linux" ]; then
               sudo apt-get install -y capnproto libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0 ruby ruby-dev rubygems build-essential libudev-dev
               sudo gem install --no-document fpm
           elif [ "$RUNNER_OS" == "macOS" ]; then
-              brew install capnp
+              brew install capnp llvm
           elif [ "$RUNNER_OS" == "Windows" ]; then
               choco install capnproto nsis
           fi
 
+      - name: Install LLVM and Clang (Windows)
+        uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "10.0"
+          directory: ${{ runner.temp }}/llvm
+        if: matrix.os == 'windows-2019'
+
       - name: Install stable Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -235,10 +283,47 @@ jobs:
           activate-environment: console_pp
           environment-file: conda.yml
 
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Caches/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'macos-10.15'
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/AppData/Local/pip/Cache
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'windows-2019'
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+        if: matrix.os == 'ubuntu-20.04'
+
       - name: Run Pip Install
         run: |
           cargo make pip-install-dev
 
+      - name: Build ${{ runner.os }} Binaries.
+        env:
+          LIBCLANG_PATH: ${{ runner.temp }}/llvm/bin
+        run: |
+          cargo make prod-installer
+        if: matrix.os == 'windows-2019'
+  
       - name: Build ${{ runner.os }} Binaries.
         env:
           OS_NAME: ${{ runner.os }}
diff --git a/Makefile.toml b/Makefile.toml
@@ -30,7 +30,7 @@ init_task = "init"
 
 # Create 'test' alias
 [tasks.test]
-dependencies = ["tests"]
+run_task = "tests"
 
 [tasks.poetry-export-dev]
 script_runner = "@shell"
@@ -255,6 +255,7 @@ args    = ["clippy", "--all-targets", "--", "--deny", "warnings"]
 [tasks.rust-tests]
 dependencies = ["copy-capnp"]
 command = "cargo"
+cwd     = "console_backend"
 args    = ["test", "--features", "tests", "--", "--nocapture"]
 
 [tasks.rust-type-check]
diff --git a/console_backend/src/lib.rs b/console_backend/src/lib.rs
@@ -11,6 +11,8 @@ pub mod observation_tab;
 pub mod output;
 pub mod piksi_tools_constants;
 pub mod process_messages;
+#[cfg(not(test))]
+#[cfg(all(not(feature = "benches"), not(feature = "tests")))]
 pub mod server;
 pub mod solution_tab;
 pub mod solution_velocity_tab;
diff --git a/console_backend/src/server.rs b/console_backend/src/server.rs
@@ -1,30 +1,19 @@
-#![allow(dead_code)]
-#![allow(unused_imports)]
-#![cfg(not(feature = "benches"))]
-#![cfg(not(feature = "tests"))]
-use capnp::message::Builder;
 use capnp::serialize;
 
 use pyo3::exceptions;
 use pyo3::prelude::*;
 use pyo3::types::PyBytes;
 
-use async_logger::Writer;
 use async_logger_log::Logger;
-use log::{debug, Record};
 
-use std::fs;
 use std::io::{BufReader, Cursor};
-use std::net::TcpStream;
-use std::sync::{mpsc, Arc, Mutex};
-use std::{thread, time::Duration};
+use std::sync::mpsc;
+use std::thread;
 
-use crate::common_constants as cc;
 use crate::console_backend_capnp as m;
 use crate::constants::LOG_WRITER_BUFFER_MESSAGE_COUNT;
 use crate::log_panel::{splitable_log_formatter, LogPanelWriter};
-use crate::process_messages::process_messages;
-use crate::types::{ClientSender, MessageSender, ServerState, SharedState, VelocityUnits};
+use crate::types::{ClientSender, ServerState, SharedState};
 use crate::utils::refresh_ports;
 
 /// The backend server
@@ -38,7 +27,6 @@ struct ServerEndpoint {
     server_send: Option<mpsc::Sender<Vec<u8>>>,
 }
 
-#[cfg(not(test))]
 #[pymethods]
 impl ServerEndpoint {
     #[new]
@@ -61,7 +49,6 @@ impl ServerEndpoint {
     }
 }
 
-#[cfg(not(test))]
 #[pymethods]
 impl Server {
     #[new]
diff --git a/console_backend/tests/log.rs b/console_backend/tests/log.rs
@@ -1,29 +1,30 @@
-#![allow(dead_code)]
-#![allow(unused_imports)]
-use log::Level;
-use logtest::Logger;
+#[cfg(feature = "tests")]
+mod log_test_impl {
 
-use console_backend::utils::compute_doppler;
+    use log::Level;
+    use logtest::Logger;
 
-#[test]
-#[cfg(feature = "tests")]
-fn log_test() {
-    // Start the logger.
+    use console_backend::utils::compute_doppler;
+
+    #[test]
+    fn log_test() {
+        // Start the logger.
 
-    let mut logger = Logger::start();
+        let mut logger = Logger::start();
 
-    compute_doppler(
-        123438650.3359375,
-        123438590.203125,
-        251746.8,
-        251746.8,
-        false,
-    );
+        compute_doppler(
+            123438650.3359375,
+            123438590.203125,
+            251746.8,
+            251746.8,
+            false,
+        );
 
-    let log_msg = logger.pop().unwrap();
-    assert_eq!(
-        log_msg.args(),
-        "Received two complete observation sets with identical TOW"
-    );
-    assert_eq!(log_msg.level(), Level::Warn);
+        let log_msg = logger.pop().unwrap();
+        assert_eq!(
+            log_msg.args(),
+            "Received two complete observation sets with identical TOW"
+        );
+        assert_eq!(log_msg.level(), Level::Warn);
+    }
 }
diff --git a/console_backend/tests/mem_benches.rs b/console_backend/tests/mem_benches.rs
