fix builds to use flydra-feature-detector

This fixes 71aadc3
strawlab · Jun 16, 2022 · 77a8d64 · 77a8d64
1 parent fefd772
commit 77a8d64
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -400,7 +400,7 @@ strand-cam-pylon-ubuntu2004:
       IPP_STATIC=1
       RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/pylon/lib"
       NUM_JOBS=2
-      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/use_ipp" --release
+      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 
     # - ../target/release/strand-cam --version # disabled because requires pylon libs in path
     - mkdir -p $CI_PROJECT_DIR/build
@@ -439,7 +439,7 @@ strand-cam-pylon-ubuntu2204:
       IPP_STATIC=1
       RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/pylon/lib"
       NUM_JOBS=2
-      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/use_ipp" --release
+      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 
     # - ../target/release/strand-cam --version # disabled because requires pylon libs in path
     - mkdir -p $CI_PROJECT_DIR/build
@@ -479,7 +479,7 @@ strand-cam-vimba-ubuntu2004:
       IPP_STATIC=1
       RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/vimba/Vimba_5_1/VimbaC/DynamicLib/x86_64bit"
       NUM_JOBS=2
-      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/use_ipp" --release
+      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 
     - ldd $CI_PROJECT_DIR/target/release/strand-cam-vimba
     - mkdir -p $CI_PROJECT_DIR/build
@@ -519,7 +519,7 @@ strand-cam-vimba-ubuntu2204:
       IPP_STATIC=1
       RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/vimba/Vimba_5_1/VimbaC/DynamicLib/x86_64bit"
       NUM_JOBS=2
-      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/use_ipp" --release
+      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff" --release
 
     - ldd $CI_PROJECT_DIR/target/release/strand-cam-vimba
     - mkdir -p $CI_PROJECT_DIR/build
@@ -631,7 +631,7 @@ strand-cam-flydratrax-pylon-ubuntu2004:
       IPP_STATIC=1
       RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/pylon/lib"
       NUM_JOBS=2
-      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo strand-cam/flydratrax strand-cam/imtrack-dark-circle ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/use_ipp" --release
+      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo strand-cam/flydratrax strand-cam/imtrack-dark-circle ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp" --release
 
     # - ../target/release/strand-cam --version # disabled because requires pylon libs in path
     - mkdir -p $CI_PROJECT_DIR/build
@@ -668,7 +668,7 @@ strand-cam-flydratrax-pylon-ubuntu2204:
       IPP_STATIC=1
       RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/pylon/lib"
       NUM_JOBS=2
-      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo strand-cam/flydratrax strand-cam/imtrack-dark-circle ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/use_ipp" --release
+      cargo build --no-default-features --features "strand-cam/bundle_files strand-cam/vpx strand-cam/posix_sched_fifo strand-cam/flydratrax strand-cam/imtrack-dark-circle ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd strand-cam/flydra_feat_detect strand-cam/use_ipp" --release
 
     # - ../target/release/strand-cam --version # disabled because requires pylon libs in path
     - mkdir -p $CI_PROJECT_DIR/build

diff --git a/py-strandcam/rust/Cargo.toml b/py-strandcam/rust/Cargo.toml
@@ -14,7 +14,7 @@ thiserror = "1.0"
 anyhow = "1.0"
 lazy_static = "1"
 
-strand-cam = {path="../../strand-cam", default-features = false, features=["bundle_files", "plugin-process-frame", "flydra_feat_detect", "imtrack-absdiff", "use_ipp", "vpx"]}
+strand-cam = {path="../../strand-cam", default-features = false, features=["flydra_feat_detect", "bundle_files", "plugin-process-frame", "flydra_feat_detect", "imtrack-absdiff", "use_ipp", "vpx"]}
 plugin-defs = {path="../../plugin-defs"}
 ipp-sys = "0.4.4" # Just so we can specify features
 

diff --git a/strand-cam/Cargo.toml b/strand-cam/Cargo.toml
@@ -114,7 +114,7 @@ backtrace = ["ci2/backtrace", "mkv-writer/backtrace", "bg-movie-writer/backtrace
 checkercal = ["strand-cam-storetype/checkercal", "opencv-calibrate", "camcal", "mvg"]
 
 plugin-process-frame = ["plugin-defs", "thread-control", "channellib"]
-flydra-uds = ["flydra-feature-detector/flydra-uds"]
+flydra-uds = ["flydra-feature-detector?/flydra-uds"]
 
 # Priority setting, high priority for camera threads, low priority for bg-image thread
 posix_sched_fifo = ["posix-scheduler", "posix-scheduler/linux"]
@@ -130,7 +130,7 @@ flydratrax = ["mvg", "nalgebra", "strand-cam-pseudo-cal", "flydra-mvg",
     "approx", "strand-cam-storetype/flydratrax", "alga",
     "flydra2", "flydra2/flat-3d", "flydra_feat_detect"]
 
-# build with the flydra-feature-detector, which also requires IPP, fastimage, etc.
+# build with the flydra-feature-detector
 flydra_feat_detect = ["flydra-feature-detector"]
 
 debug-images = ["flydra-feature-detector?/debug-images", "rt-image-viewer"]

diff --git a/strand-cam/src/strand-cam.rs b/strand-cam/src/strand-cam.rs
@@ -811,6 +811,9 @@ async fn frame_process_task(
     #[cfg(not(feature = "flydra_feat_detect"))]
     std::mem::drop(transmit_feature_detect_settings_tx);
 
+    #[cfg(not(feature = "flydra_feat_detect"))]
+    debug!("Not using FlydraFeatureDetector.");
+
     #[cfg(feature = "flydra_feat_detect")]
     let coord_socket = if let Some(camdata_addr) = camdata_addr {
         // If `camdata_addr` is not None, it is used to set open a socket to send
@@ -820,6 +823,7 @@ async fn frame_process_task(
             &camdata_addr,
         )?)
     } else {
+        debug!("Using FlydraFeatureDetector, but not sending tracked points to braid.");
         None
     };
 

diff --git a/strand-cam/strand-cam-vimba/build.sh b/strand-cam/strand-cam-vimba/build.sh
@@ -12,4 +12,4 @@ PKG_CONFIG_PATH=/opt/opencv-4.5.5-static/lib/pkgconfig:/opt/libvpx/libvpx-1.8.0/
 IPP_STATIC=1 \
 RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge -C codegen-units=1 -C link-args=-Wl,-rpath,/opt/vimba/Vimba_5_1/VimbaC/DynamicLib/x86_64bit" \
 NUM_JOBS=2 \
-cargo build --features "strand-cam/bundle_files strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd" --release
+cargo build --features "strand-cam/flydra_feat_detect strand-cam/use_ipp strand-cam/imtrack-absdiff strand-cam/bundle_files strand-cam/posix_sched_fifo ipp-sys/2019 strand-cam/checkercal strand-cam/fiducial backtrace imops/simd" --release