Hotfix for ml.learn

Update to be compatible with new utils.load_infile Co-authored-by: Ryan <[email protected]>
LLNL · Sep 26, 2022 · ac92608 · ac92608
1 parent 00451ee
commit ac92608
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to Merlin Spellbook will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.4]
+### Fixed
+- `learn.make_regressor` and `learn_alt.random_forest` properly calls `utils.load_infile`.
+
 ## [0.7.3]
 ### Fixed
 - `make-barrier-qoi` can accept no constraints.

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin-Spellbook, Version: 0.7.3.
+# This file is part of Merlin-Spellbook, Version: 0.7.4.
 #
 # For details, see https://github.com/LLNL/merlin-spellbook.
 #

diff --git a/spellbook/__init__.py b/spellbook/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 
 VERSION = __version__
diff --git a/spellbook/data_formatting/conduit/python/conduit_bundler.py b/spellbook/data_formatting/conduit/python/conduit_bundler.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-<PENDING>
 # All rights reserved.
-# This file is part of merlin-spellbook, Version: 0.7.3.
+# This file is part of merlin-spellbook, Version: 0.7.4.
 #
 # For details, see https://github.com/LLNL/merlin-spellbook.
 #

diff --git a/spellbook/log_formatter.py b/spellbook/log_formatter.py
@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin Spellbook, Version: 0.7.3.
+# This file is part of Merlin Spellbook, Version: 0.7.4.
 #
 # For details, see https://github.com/LLNL/merlin.
 #

diff --git a/spellbook/ml/learn.py b/spellbook/ml/learn.py
@@ -45,7 +45,7 @@ def make_regressor(args):
         reg_args = args.reg_args
 
     regr = surrogates.sklearnRegressors.factory(args.regressor, **reg_args)
-    X, y = load_infile(args)
+    X, y = load_infile(args.infile, X_keys=args.X, y_keys=args.y)
 
     n_samples_X = X.shape[0]
     n_samples_y = y.shape[0]

diff --git a/spellbook/ml/learn_alt.py b/spellbook/ml/learn_alt.py
@@ -16,7 +16,8 @@ def random_forest(args):
     forest_args = FOREST_DEFAULTS
 
     regr = RandomForestRegressor(**forest_args)
-    X, y = load_infile(args)
+
+    X, y = load_infile(args.infile, X_keys=args.X, y_keys=args.y)
 
     n_samples_X = X.shape[0]
     n_samples_y = y.shape[0]