Merge remote-tracking branch 'origin/master'

Author: cmccomb

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "automl"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["Chris McComb <[email protected]>"]
 description = "Automated machine learning for classification and regression"
 edition = "2021"
@@ -21,7 +21,6 @@ comfy-table = "5.0.0"
 humantime = "2.1.0"
 ndarray = {version = "0.15.3", optional = true}
 polars = {version = "0.17.0", features = ["ndarray"], optional = true}
-eframe = {version = "0.15.0", optional = true}
 url = {version = "2.2.2", optional = true}
 temp-file = {version = "0.1.6", optional = true}
 csv-sniffer = { version = "0.1.1", optional = true }
@@ -31,9 +30,4 @@ serde_yaml = "0.8.23"
 [features]
 default = []
 nd = ["ndarray"]
-gui = ["eframe"]
-csv = ["polars", "nd", "url", "temp-file", "minreq", "csv-sniffer"]
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
+csv = ["polars", "nd", "url", "temp-file", "minreq", "csv-sniffer"]

README.md

@@ -10,7 +10,7 @@ and provides some utilities to quickly train and compare models.
 # Install
 To use the latest released version of `AutoML`, add this to your `Cargo.toml`:
 ```toml
-automl = "0.2.5"
+automl = "0.2.6"
 ```
 To use the bleeding edge instead, add this:
 ```toml
@@ -54,8 +54,6 @@ This crate has several features that add some additional methods
 |:----------|:----------------------------------------------------------------------------------------------------------|
 | `nd`      | Adds methods for predicting/reading data using [`ndarray`](https://crates.io/crates/ndarray).             |
 | `csv`     | Adds methods for predicting/reading data from a .csv using [`polars`](https://crates.io/crates/polars).   |
-| `gui`     | Adds a method for running a live demo GUI of a model through [`eframe`](https://crates.io/crates/eframe). |
-
 
 ## Capabilities
 - Feature Engineering

assets/gui.png

@@ -3,7 +3,6 @@
 #![warn(rustdoc::missing_doc_code_examples)]
 #![warn(clippy::missing_docs_in_private_items)]
 #![doc = include_str!("../README.md")]
-#![cfg_attr(docsrs, feature(doc_cfg))]
 
 pub mod settings;
 pub use settings::Settings;
@@ -44,9 +43,6 @@ use std::{
 #[cfg(any(feature = "nd"))]
 use ndarray::{Array1, Array2};
 
-#[cfg(any(feature = "gui"))]
-use eframe::{egui, epi};
-
 #[cfg(any(feature = "csv"))]
 use {
     polars::prelude::{DataFrame, Float32Type},
@@ -174,8 +170,6 @@ pub struct SupervisedModel {
         Option<PCA<f32, DenseMatrix<f32>>>,
         Option<SVD<f32, DenseMatrix<f32>>>,
     ),
-    #[cfg(any(feature = "gui"))]
-    current_x: Vec<f32>,
 }
 
 impl SupervisedModel {
@@ -567,27 +561,6 @@ impl SupervisedModel {
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "gui")))]
-#[cfg(any(feature = "gui"))]
-impl SupervisedModel {
-    /// Runs an interactive GUI to demonstrate the final model
-    /// ```no_run
-    /// # use automl::{SupervisedModel, Settings};
-    /// let mut model = SupervisedModel::new(
-    ///     smartcore::dataset::diabetes::load_dataset(),
-    ///     Settings::default_regression()
-    /// # .only(automl::settings::Algorithm::Linear)
-    /// );
-    /// model.train();
-    /// model.run_gui();
-    /// ```
-    /// ![Example of interactive gui demo](https://raw.githubusercontent.com/cmccomb/rust-automl/master/assets/gui.png)
-    pub fn run_gui(self) {
-        let native_options = eframe::NativeOptions::default();
-        eframe::run_native(Box::new(self), native_options);
-    }
-}
-
 /// Private functions go here
 impl SupervisedModel {
     fn build(x: DenseMatrix<f32>, y: Vec<f32>, settings: Settings) -> Self {
@@ -599,8 +572,6 @@ impl SupervisedModel {
             y_val: vec![],
             number_of_classes: Self::count_classes(&y),
             comparison: vec![],
-            #[cfg(any(feature = "gui"))]
-            current_x: vec![0.0; x.shape().1],
             preprocessing: (None, None),
             metamodel: Default::default(),
         }
@@ -881,54 +852,6 @@ impl Display for SupervisedModel {
     }
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "gui")))]
-#[cfg(any(feature = "gui"))]
-impl epi::App for SupervisedModel {
-    fn update(&mut self, ctx: &egui::CtxRef, _frame: &mut epi::Frame<'_>) {
-        egui::CentralPanel::default().show(ctx, |ui| {
-            // Add a heading that displays the type of model this is
-            ui.heading(format!("{}", self.comparison[0].name));
-
-            // Add a label that shows the prediction
-            ui.label(format!(
-                "Prediction: y = {}",
-                self.predict(vec![self.current_x.to_vec(); 1])[0]
-            ));
-
-            // Separating the model name and prediction from the input values
-            ui.separator();
-
-            // Step through input values to make sliders
-            for i in 0..self.current_x.len() {
-                // Figure out the maximum in the training dataa
-                let maxx = self
-                    .x_train
-                    .get_col_as_vec(i)
-                    .iter()
-                    .cloned()
-                    .fold(0. / 0., f32::max);
-
-                // Figure out the minimum in the training data
-                let minn = self
-                    .x_train
-                    .get_col_as_vec(i)
-                    .iter()
-                    .cloned()
-                    .fold(0. / 0., f32::min);
-
-                // Add the slider
-                ui.add(
-                    egui::Slider::new(&mut self.current_x[i], minn..=maxx).text(format!("x_{}", i)),
-                );
-            }
-        });
-    }
-
-    fn name(&self) -> &str {
-        "Model Demo"
-    }
-}
-
 /// This contains the results of a single model
 #[derive(serde::Serialize, serde::Deserialize)]
 struct Model {