Skip to content

Commit

Permalink
Change dependencies. See details.
Browse files Browse the repository at this point in the history
- `trajectory_analysis_tools` and `replay_trajectory_classification` are
  superceded by `non_local_detector`.
- `dask-cuda` not in use, per @edeno
  • Loading branch information
CBroz1 committed Feb 7, 2024
1 parent 4f0d139 commit f8f3723
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 23 deletions.
6 changes: 1 addition & 5 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ channels:
dependencies:
- bottleneck
# - cudatoolkit=11.3 # dlc-only
# - cupy # dlc-only
# - dask-cuda # dlc-only
- cupy
# - ffmpeg # dlc-only
- ipympl
- jupyterlab>=3.*
Expand All @@ -32,17 +31,14 @@ dependencies:
- pyfftw<=0.12.0 # ghostipy req. install from conda-forge for Mac ARM
- python>=3.9,<3.10
- pytorch<1.12.0
- replay_trajectory_classification
- ripple_detection
- seaborn
# - torchaudio # dlc-only
# - torchvision # dlc-only
- track_linearization>=2.3
# - trajectory_analysis_tools # dlc-only
- pip:
- datajoint>=0.13.6
# - deeplabcut<2.3.0 # dlc-only
- figurl-jupyter
- ghostipy # for common_filter
- ndx-franklab-novela>=0.1.0
- mountainsort4
Expand Down
16 changes: 6 additions & 10 deletions environment_dlc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,35 @@ name: spyglass-dlc
channels:
- conda-forge
- defaults
- pytorch # dlc-only
- pytorch # dlc-only
- franklab
- edeno
dependencies:
- bottleneck
- cudatoolkit=11.3 # dlc-only
- cupy # dlc-only
- dask-cuda # dlc-only
- ffmpeg # dlc-only
- cudatoolkit=11.3 # dlc-only
- cupy
- ffmpeg # dlc-only
- ipympl
- jupyterlab>=3.*
- libgcc # dlc-only
- libgcc # dlc-only
- matplotlib
- non_local_detector
- numpy<1.24
- pip>=20.2.*
- position_tools
- pybind11 # req by mountainsort4 -> isosplit5
- pybind11 # req by mountainsort4 -> isosplit5
- pydotplus>=2.0.*
- pyfftw<=0.12.0 # ghostipy req. install from conda-forge for Mac ARM
- python>=3.9,<3.10
- pytorch<1.12.0
- replay_trajectory_classification
- ripple_detection
- seaborn
- torchaudio # dlc-only
- torchvision # dlc-only
- track_linearization>=2.3
- trajectory_analysis_tools # dlc-only
- pip:
- datajoint>=0.13.6
- deeplabcut<2.3.0
- figurl-jupyter
- ghostipy # for common_filter
- ndx-franklab-novela>=0.1.0
- mountainsort4
Expand Down
22 changes: 14 additions & 8 deletions src/spyglass/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,14 +544,20 @@ def dlc_output_dir(self) -> str:
if sg_config.load_failed: # Failed to load
logger.warning("Failed to load SpyglassConfig. Please set up config file.")
config = {} # Let __intit__ fetch empty config for first time setup
config, prepopulate, test_mode, base_dir, raw_dir, analysis_dir = (
{},
False,
False,
None,
None,
None,
)
prepopulate = False
test_mode = False
debug_mode = False
base_dir = None
raw_dir = None
recording_dir = None
temp_dir = None
analysis_dir = None
sorting_dir = None
waveform_dir = None
video_dir = None
dlc_project_dir = None
dlc_video_dir = None
dlc_output_dir = None
else:
config = sg_config.config
base_dir = sg_config.base_dir
Expand Down

0 comments on commit f8f3723

Please sign in to comment.