Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix imports for refactored behavior_models repo #57

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix imports for refactored behavior_models repo #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion brainwidemap/decoding/05_format_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from tqdm import tqdm


from behavior_models.models.utils import format_data as format_data_mut
from behavior_models.utils import format_data as format_data_mut
from brainwidemap.decoding.settings import RESULTS_DIR, SETTINGS_FORMAT_NAME, params
from brainwidemap.decoding.functions.process_outputs import fix_pd_regions

Expand Down
6 changes: 3 additions & 3 deletions brainwidemap/decoding/functions/decoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from sklearn.metrics import accuracy_score, balanced_accuracy_score, r2_score
from sklearn.model_selection import KFold, train_test_split
from tqdm import tqdm
from behavior_models.models.utils import format_data as format_data_mut
from behavior_models.models.utils import format_input as format_input_mut
from behavior_models.utils import format_data as format_data_mut
from behavior_models.utils import format_input as format_input_mut

from ibllib.atlas import BrainRegions
from iblatlas.regions import BrainRegions

from brainwidemap.decoding.functions.balancedweightings import balanced_weighting
from brainwidemap.decoding.functions.process_inputs import build_predictor_matrix
Expand Down
2 changes: 1 addition & 1 deletion brainwidemap/decoding/functions/nulldistributions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np
import torch
from behavior_models.models.utils import format_input as mut_format_input
from behavior_models.utils import format_input as mut_format_input
from brainbox.task.closed_loop import generate_pseudo_session
from brainwidemap.decoding.functions.process_targets import optimal_Bayesian, check_bhv_fit_exists

Expand Down
6 changes: 3 additions & 3 deletions brainwidemap/decoding/functions/process_targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import torch
from scipy.interpolate import interp1d

from behavior_models.models.utils import format_data as format_data_mut
from behavior_models.models.utils import format_input as format_input_mut
from behavior_models.models.utils import build_path as build_path_mut
from behavior_models.utils import format_data as format_data_mut
from behavior_models.utils import format_input as format_input_mut
from behavior_models.utils import build_path as build_path_mut
from brainwidemap.bwm_loading import load_trials_and_mask


Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_block.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_choice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_feedback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_stim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_stimside.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-speed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_for_BWM_figure/settings_wheel-vel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down
4 changes: 2 additions & 2 deletions brainwidemap/decoding/settings_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from pathlib import Path

from brainwidemap.decoding.functions.process_targets import optimal_Bayesian
from behavior_models.models.expSmoothing_prevAction import expSmoothing_prevAction
from behavior_models.models.expSmoothing_stimside import expSmoothing_stimside
from behavior_models.models import ActionKernel as expSmoothing_prevAction
from behavior_models.models import StimulusKernel as expSmoothing_stimside
from sklearn import linear_model as lm

"""
Expand Down