Skip to content
This repository was archived by the owner on Feb 8, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8589218
Update black formatting for a few files.
arokem Mar 21, 2023
03173f3
Upgrade python version support.
arokem Jan 14, 2024
bee0776
Upgrade docbuild Python version as well.
arokem Jan 14, 2024
6082fea
Support for 3.12 will have to wait for groupyr.
arokem Jan 14, 2024
3391b21
Pin a few of the dependencies to make sure things install.
arokem Jan 14, 2024
cb1c713
Pin a more advanced pandas, don't pin scipy.
arokem Jan 14, 2024
28c4368
Be explicit about trip_msg input for optional_pkg.
arokem Jan 18, 2024
6cb6148
Upgrade to newest groupyr.
arokem Feb 9, 2024
ef6cd1f
Pin numpy version under 2.0
arokem Feb 9, 2024
87f1e4e
Make sure this is the right type.
arokem Feb 12, 2024
576cdc1
Upgrade to new groupyr release (0.3.3).
arokem Feb 23, 2024
7e3996c
Update black setup.
arokem Feb 23, 2024
f47c250
Linting.
arokem Feb 23, 2024
02c236d
More linting.
arokem Feb 23, 2024
17ce505
Update testing tox.ini environment.
arokem Feb 23, 2024
1b88ac6
Try to get a reasonable scipy by pinning sklearn.
arokem Feb 23, 2024
707fabd
Avoid tox.
arokem Feb 23, 2024
b0fe890
Fix copy-paste artifacts.
arokem Feb 23, 2024
9d0772e
Replaces sklearn testing functions with pytest/numpy.
arokem Feb 23, 2024
0a7e9ea
Remove CNN module that is no longer used.
arokem Feb 23, 2024
6c99748
Deprecated np.float not used.
arokem Feb 23, 2024
3d14cce
Pin numpy 1.23.5
arokem Feb 23, 2024
2ee4e8e
Implement the other required attribute of this dummy class.
arokem Feb 24, 2024
fdcecda
Coerce a float type for y.
arokem Feb 24, 2024
e18b6fc
Initial draft implementation of an autoencoder model.
arokem Jan 14, 2024
7e92439
Fixes this test, that was failing because of non-numeric values in se…
arokem Jan 14, 2024
573c29d
Be a little more liberal with dtype here.
arokem Jan 14, 2024
8777f9d
Include dl_qc_score when loading the hbn data.
arokem Jan 15, 2024
6d2da26
A bit more progress on autoencoder.
arokem Jan 18, 2024
dfb102d
Adds a conv autoencoder.
arokem Feb 12, 2024
951b3f6
Adds Initial implementation of a VAE.
arokem Feb 12, 2024
e31f680
Make sure that encoding dimension takes a non-None value.
arokem Feb 12, 2024
68f03d5
More work on autoencoder.
arokem Feb 23, 2024
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 .github/workflows/docbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.7, 3.8, 3.9, "3.10"]
python-version: ["3.10", "3.11"]

steps:
- name: Checkout repo
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.7, 3.8, 3.9, "3.10"]
python-version: ["3.10", "3.11"]

steps:
- name: Checkout repo
Expand All @@ -30,12 +30,11 @@ jobs:
pydocstyle
- name: Test
run: |
cp $(python -c 'import site; print(site.getsitepackages()[0])')/afqinsight/_version.py afqinsight/_version.py
tox
cd && mkdir for_test && cd for_test && pytest --pyargs afqinsight --cov-report term-missing --cov=afqinsight
- name: Coveralls
run: |
coveralls
if: matrix.python-version == 3.8
if: matrix.python-version == 3.10
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/python/black
rev: 22.3.0
rev: 24.2.0
hooks:
- id: black
language_version: python3.8
language_version: python
1 change: 1 addition & 0 deletions afqinsight/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""AFQ-Insight is a Python library for statistical learning of tractometry data."""

from . import datasets # noqa
from . import utils # noqa
from .cross_validate import * # noqa
Expand Down
5 changes: 3 additions & 2 deletions afqinsight/_serial_bagging.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
parallelism when using a dask.distributed backend, I will gladly remove this
private module. @richford
"""

import itertools
import numbers
import numpy as np
Expand Down Expand Up @@ -383,7 +384,7 @@ def _fit(self, X, y, max_samples=None, max_depth=None, sample_weight=None):
# Validate max_features
if isinstance(self.max_features, numbers.Integral):
max_features = self.max_features
elif isinstance(self.max_features, np.float):
elif isinstance(self.max_features, float):
max_features = self.max_features * self.n_features_in_
else:
raise ValueError("max_features must be int or float")
Expand Down Expand Up @@ -897,7 +898,7 @@ def _fit(self, X, y, max_samples=None, max_depth=None, sample_weight=None):
# Validate max_features
if isinstance(self.max_features, numbers.Integral):
max_features = self.max_features
elif isinstance(self.max_features, np.float): # pragma: no cover
elif isinstance(self.max_features, float): # pragma: no cover
max_features = self.max_features * self.n_features_in_
else: # pragma: no cover
raise ValueError("max_features must be int or float")
Expand Down
1 change: 1 addition & 0 deletions afqinsight/augmentation/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
augmentation for time series classification with neural networks," PLOS ONE
16(7): e0254841. DOI: https://doi.org/10.1371/journal.pone.0254841
"""

from .augmentation import * # noqa: F401,F403
1 change: 1 addition & 0 deletions afqinsight/augmentation/augmentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
augmentation for time series classification with neural networks," PLOS ONE
16(7): e0254841. DOI: https://doi.org/10.1371/journal.pone.0254841
"""

import numpy as np
from tqdm import tqdm

Expand Down
1 change: 1 addition & 0 deletions afqinsight/augmentation/dtw.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
augmentation for time series classification with neural networks," PLOS ONE
16(7): e0254841. DOI: https://doi.org/10.1371/journal.pone.0254841
"""

import numpy as np
import sys

Expand Down
Loading