Deadlock pulsification register

.travis/bundle-entrypoint.sh

@@ -112,6 +112,9 @@ net_bench speaker_id pulse8 $CACHEDIR/speaker-id-2019-03.onnx -i 1,S,40,f32 --ou
 net_bench voicecom_fake_quant 2sec $CACHEDIR/snips-voice-commands-cnn-fake-quant.pb -i 200,10,f32
 net_bench voicecom_float 2sec $CACHEDIR/snips-voice-commands-cnn-float.pb -i 200,10,f32
 
+net_bench trunet pulse1_f32 $CACHEDIR/trunet_dummy.nnef.tgz --nnef-tract-core --pulse 1
+net_bench trunet pulse1_f16 $CACHEDIR/trunet_dummy.nnef.tgz --nnef-tract-core --half-floats --pulse 1
+
 . $PRIVATE
 
 end=$(date +%s)

cli/src/params.rs

@@ -682,6 +682,12 @@ impl Parameters {
             dec.optimize(&mut m)?;
             Ok(m)
         });
+        #[cfg(not(feature = "pulse"))]
+        {
+            if matches.value_of("pulse").is_some() {
+                bail!("This build of tract has pulse disabled.")
+            }
+        }
         #[cfg(feature = "pulse")]
         {
             if let Some(spec) = matches.value_of("pulse") {

pulse/src/model.rs

@@ -1,4 +1,4 @@
-use std::sync::Mutex;
+use std::sync::RwLock;
 
 use crate::fact::StreamInfo;
 use crate::{internal::*, ops::sync_inputs};
@@ -109,7 +109,7 @@ impl SpecialOps<PulsedFact, Box<dyn PulsedOp>> for PulsedModel {
     }
 }
 
-struct Pulsifier(Symbol, TDim, Arc<Mutex<HashMap<TypeId, crate::ops::OpPulsifier>>>);
+struct Pulsifier(Symbol, TDim, Arc<RwLock<HashMap<TypeId, crate::ops::OpPulsifier>>>);
 
 impl std::fmt::Debug for Pulsifier {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -138,10 +138,12 @@ impl
             )?
             .unwrap());
         }
+        log::debug!("Pulsifying node {node}");
 
         if let Some(pulsified) =
             OpPulsifier::pulsify(source, node, target, mapping, &self.0, &self.1)?
         {
+            log::debug!("Pulsified node {node} with adhoc pulsifier");
             return Ok(pulsified);
         }
 
@@ -150,6 +152,7 @@ impl
         if pulse_facts.iter().all(|pf| pf.stream.is_none()) {
             let pulse_op = NonPulsingWrappingOp(node.op.clone());
             let inputs: TVec<OutletId> = node.inputs.iter().map(|i| mapping[i]).collect();
+            log::debug!("Pulsified node {node} with NonPulsingWrappingOp");
             return target.wire_node(&node.name, pulse_op, &inputs);
         }
 
@@ -162,6 +165,7 @@ impl
         if axis_info.outputs[0].len() == 1 {
             let pulse_op = PulseWrappingOp(node.op.clone());
             let inputs = sync_inputs(node, target, mapping)?;
+            log::debug!("Pulsified node {node} with PulsingWrappingOp");
             return target.wire_node(&node.name, pulse_op, &inputs);
         }
 

pulse/src/ops/mod.rs

@@ -1,5 +1,5 @@
 use std::any::Any;
-use std::sync::Mutex;
+use std::sync::RwLock;
 
 use crate::internal::*;
 use lazy_static::lazy_static;
@@ -64,20 +64,20 @@ pub struct OpPulsifier {
 }
 
 impl OpPulsifier {
-    pub fn inventory() -> Arc<Mutex<HashMap<TypeId, OpPulsifier>>> {
+    pub fn inventory() -> Arc<RwLock<HashMap<TypeId, OpPulsifier>>> {
         lazy_static! {
-            static ref INVENTORY: Arc<Mutex<HashMap<TypeId, OpPulsifier>>> = {
+            static ref INVENTORY: Arc<RwLock<HashMap<TypeId, OpPulsifier>>> = {
                 let mut it = HashMap::default();
                 register_all(&mut it);
-                Arc::new(Mutex::new(it))
+                Arc::new(RwLock::new(it))
             };
         };
         (*INVENTORY).clone()
     }
 
     pub fn register<T: Any>(func: PulsifierFn) -> TractResult<()> {
         let inv = Self::inventory();
-        let mut inv = inv.lock().map_err(|e| anyhow!("Fail to lock inventory {e}"))?;
+        let mut inv = inv.write().map_err(|e| anyhow!("Fail to lock inventory {e}"))?;
         inv.insert(
             std::any::TypeId::of::<T>(),
             OpPulsifier {
@@ -98,7 +98,7 @@ impl OpPulsifier {
         pulse: &TDim,
     ) -> TractResult<Option<TVec<OutletId>>> {
         let inv = Self::inventory();
-        let inv = inv.lock().map_err(|e| anyhow!("Fail to lock inventory {e}"))?;
+        let inv = inv.read().map_err(|e| anyhow!("Fail to lock inventory {e}"))?;
         if let Some(pulsifier) = inv.get(&(*node.op).type_id()) {
             if let Some(pulsified) = (pulsifier.func)(source, node, target, mapping, symbol, pulse)?
             {