Skip to content

Commit

Permalink
more merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ckmah committed Apr 5, 2024
1 parent 8fdfdf1 commit fcb72ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 103 deletions.
101 changes: 0 additions & 101 deletions bento/_settings.py

This file was deleted.

4 changes: 2 additions & 2 deletions bento/tools/_lp.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def lp(
X_df = sdata.table.uns[feature_key][pattern_features]

# Load trained model
model_path = os.path.join(os.path.split(bento.__file__)[0], "models", "rf_calib_20220514.pkl")
model = pickle.load(open(model_path, "rb"))
model_dir = "/".join(bento.__file__.split("/")[:-1]) + "/models"
model = pickle.load(open(f"{model_dir}/rf_calib_20220514.pkl", "rb"))

# Compatibility with newer versions of scikit-learn
for cls in model.calibrated_classifiers_:
Expand Down

0 comments on commit fcb72ec

Please sign in to comment.