added exec platform info

Author: erhant

Cargo.lock

@@ -7,7 +7,7 @@ default-members = ["compute"]
 
 [workspace.package]
 edition = "2021"
-version = "0.6.0"
+version = "0.6.1"
 license = "Apache-2.0"
 readme = "README.md"
 

Cargo.toml

@@ -39,6 +39,10 @@ pub struct DriaComputeNodeConfig {
     ///
     /// TODO: this is `None` after startup due to `Option::take`, can we do any better?
     pub initial_rpc_addr: Option<Multiaddr>,
+    /// Execution platform, mainly for diagnostics.
+    ///
+    /// Given by `DKN_EXEC_PLATFORM`.
+    pub exec_platform: String,
 }
 
 #[allow(clippy::new_without_default)]
@@ -118,6 +122,9 @@ impl DriaComputeNodeConfig {
                 Multiaddr::from_str(&addr).expect("could not parse the given initial RPC address.")
             });
 
+        // parse execution platform
+        let exec_platform = env::var("DKN_EXEC_PLATFORM").unwrap_or_else(|_| "unknown".to_string());
+
         Self {
             secret_key,
             public_key,
@@ -129,6 +136,7 @@ impl DriaComputeNodeConfig {
             network: network_type,
             batch_size,
             initial_rpc_addr,
+            exec_platform,
         }
     }
 

compute/src/config.rs

@@ -126,7 +126,12 @@ impl DriaComputeNode {
         let model_names = config.executors.get_model_names();
         let points_client = DriaPointsClient::new(&config.address, &config.network)?;
 
-        let spec_collector = SpecCollector::new(model_names.clone(), model_perf, config.version);
+        let spec_collector = SpecCollector::new(
+            model_names.clone(),
+            model_perf,
+            config.version,
+            config.exec_platform.clone(),
+        );
         Ok((
             DriaComputeNode {
                 config,

compute/src/node/mod.rs

@@ -17,22 +17,20 @@ pub struct SpecCollector {
     model_perf: HashMap<String, SpecModelPerformance>,
     /// Version string.
     version: String,
+    /// Execution platform, mainly for diagnostics.
+    exec_platform: String,
     // GPU adapter infos, showing information about the available GPUs.
     // gpus: Vec<wgpu::AdapterInfo>,
 }
 
-// impl Default for SpecCollector {
-//     fn default() -> Self {
-//         Self::new(vec![], SemanticVersion::default())
-//     }
-// }
-
 impl SpecCollector {
     pub fn new(
         models: Vec<String>,
         model_perf: HashMap<Model, SpecModelPerformance>,
         version: SemanticVersion,
+        exec_platform: String,
     ) -> Self {
+        log::debug!("Creating spec collector with version {version} and platform {exec_platform}");
         SpecCollector {
             system: sysinfo::System::new_with_specifics(Self::get_refresh_specifics()),
             models,
@@ -41,6 +39,7 @@ impl SpecCollector {
                 .map(|(k, v)| (k.to_string(), v))
                 .collect(),
             version: version.to_string(),
+            exec_platform,
             // gpus: wgpu::Instance::default()
             //     .enumerate_adapters(wgpu::Backends::all())
             //     .into_iter()
@@ -72,6 +71,7 @@ impl SpecCollector {
             models: self.models.clone(),
             version: self.version.clone(),
             model_perf: self.model_perf.clone(),
+            exec_platform: self.exec_platform.clone(),
             // gpus: self.gpus.clone(),
         }
     }
@@ -94,6 +94,7 @@ mod tests {
                 minor: 5,
                 patch: 1,
             },
+            "testing".to_string(),
         );
         let specs = spec_collector.collect().await;
         assert!(specs.total_mem > 0);
@@ -104,7 +105,9 @@ mod tests {
         assert!(!specs.arch.is_empty());
         assert!(specs.lookup.is_some());
         assert!(!specs.models.is_empty());
+        assert_eq!(specs.model_perf.len(), 3);
         assert_eq!(specs.version, "4.5.1");
+        assert_eq!(specs.exec_platform, "testing");
 
         // should be serializable to JSON
         assert!(serde_json::to_string_pretty(&specs).is_ok())

compute/src/utils/specs.rs

@@ -46,6 +46,8 @@ pub struct Specs {
     pub model_perf: HashMap<String, SpecModelPerformance>,
     /// Node version, e.g. `0.1.0`.
     pub version: String,
+    /// Name of the execution platform, e.g. Docker file or Launcher.
+    pub exec_platform: String,
     // GPU adapter infos, showing information about the available GPUs.
     // gpus: Vec<wgpu::AdapterInfo>,
 }