actinet 0.0.dev1__tar.gz → 0.0.dev3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. {actinet-0.0.dev1 → actinet-0.0.dev3}/PKG-INFO +1 -1
  2. {actinet-0.0.dev1 → actinet-0.0.dev3}/setup.py +1 -1
  3. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/__init__.py +1 -1
  4. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/_version.py +3 -3
  5. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/actinet.py +13 -0
  6. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/PKG-INFO +1 -1
  7. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/requires.txt +1 -1
  8. {actinet-0.0.dev1 → actinet-0.0.dev3}/LICENSE.md +0 -0
  9. {actinet-0.0.dev1 → actinet-0.0.dev3}/README.md +0 -0
  10. {actinet-0.0.dev1 → actinet-0.0.dev3}/pyproject.toml +0 -0
  11. {actinet-0.0.dev1 → actinet-0.0.dev3}/setup.cfg +0 -0
  12. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/accPlot.py +0 -0
  13. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/circadian.py +0 -0
  14. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/hmm.py +0 -0
  15. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/models.py +0 -0
  16. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/sslmodel.py +0 -0
  17. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/summarisation.py +0 -0
  18. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/utils/__init__.py +0 -0
  19. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/utils/collate_outputs.py +0 -0
  20. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/utils/generate_commands.py +0 -0
  21. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/utils/utils.py +0 -0
  22. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/SOURCES.txt +0 -0
  23. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/dependency_links.txt +0 -0
  24. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/entry_points.txt +0 -0
  25. {actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/top_level.txt +0 -0
  26. {actinet-0.0.dev1 → actinet-0.0.dev3}/versioneer.py +0 -0
{actinet-0.0.dev1 → actinet-0.0.dev3}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: actinet
3
- Version: 0.0.dev1
3
+ Version: 0.0.dev3
4
4
  Summary: Activity detection algorithm compatible with the UK Biobank Accelerometer Dataset
5
5
  Home-page: https://github.com/OxWearables/actinet
6
6
  Download-URL: https://github.com/OxWearables/actinet
{actinet-0.0.dev1 → actinet-0.0.dev3}/setup.py RENAMED
@@ -55,6 +55,7 @@ def main():
55
55
  "scipy==1.10.*",
56
56
  "pandas==2.0.*",
57
57
  "tqdm==4.64.*",
58
+ "matplotlib==3.1.*",
58
59
  "joblib==1.2.*",
59
60
  "scikit-learn==1.1.1",
60
61
  "imbalanced-learn==0.9.1",
@@ -72,7 +73,6 @@ def main():
72
73
  "autopep8",
73
74
  "tomli",
74
75
  "jupyter",
75
- "matplotlib",
76
76
  ],
77
77
  "docs": [
78
78
  "sphinx>=4.2",
{actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/__init__.py RENAMED
@@ -5,7 +5,7 @@ __maintainer_email__ = "shing.chan@ndph.ox.ac.uk"
5
5
  __license__ = "See LICENSE file."
6
6
 
7
7
  __model_version__ = "ssl_ukb_c24_rw_20240204"
8
- __model_md5__ = ""
8
+ __model_md5__ = "c13390ff024e4714eb027aa66160e2eb"
9
9
 
10
10
  from . import _version
11
11
 
{actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/_version.py RENAMED
@@ -8,11 +8,11 @@ import json
8
8
 
9
9
  version_json = '''
10
10
  {
11
- "date": "2024-02-04T20:30:21+0000",
11
+ "date": "2024-02-05T11:05:44+0000",
12
12
  "dirty": false,
13
13
  "error": null,
14
- "full-revisionid": "14343aaae46ebb15551aa116221b1e91c9cf4b96",
15
- "version": "0.0.dev1"
14
+ "full-revisionid": "6f3133800a30a331e1a981b9b93937b5fd0e7f1a",
15
+ "version": "0.0.dev3"
16
16
  }
17
17
  ''' # END VERSION_JSON
18
18
 
{actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet/actinet.py RENAMED
@@ -62,6 +62,11 @@ def main():
62
62
  action="store_true",
63
63
  help="Plot the predicted activity labels",
64
64
  )
65
+ parser.add_argument(
66
+ "--cache-ssl",
67
+ action="store_true",
68
+ help="Download and cache ssl module for offline usage",
69
+ )
65
70
  parser.add_argument("--quiet", "-q", action="store_true", help="Suppress output")
66
71
  args = parser.parse_args()
67
72
 
@@ -69,6 +74,14 @@ def main():
69
74
 
70
75
  verbose = not args.quiet
71
76
 
77
+ if args.cache_ssl:
78
+ model = ActivityClassifier(weights_path=True, ssl_repo=None, verbose=verbose)
79
+
80
+ after = time.time()
81
+ print(f"Done! ({round(after - before,2)}s)")
82
+
83
+ return
84
+
72
85
  # Load file
73
86
  data, info = read(
74
87
  args.filepath,
{actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: actinet
3
- Version: 0.0.dev1
3
+ Version: 0.0.dev3
4
4
  Summary: Activity detection algorithm compatible with the UK Biobank Accelerometer Dataset
5
5
  Home-page: https://github.com/OxWearables/actinet
6
6
  Download-URL: https://github.com/OxWearables/actinet
{actinet-0.0.dev1 → actinet-0.0.dev3}/src/actinet.egg-info/requires.txt RENAMED
@@ -3,6 +3,7 @@ numpy==1.24.*
3
3
  scipy==1.10.*
4
4
  pandas==2.0.*
5
5
  tqdm==4.64.*
6
+ matplotlib==3.1.*
6
7
  joblib==1.2.*
7
8
  scikit-learn==1.1.1
8
9
  imbalanced-learn==0.9.1
@@ -19,7 +20,6 @@ flake8
19
20
  autopep8
20
21
  tomli
21
22
  jupyter
22
- matplotlib
23
23
 
24
24
  [docs]
25
25
  sphinx>=4.2
{actinet-0.0.dev1 → actinet-0.0.dev3}/LICENSE.md RENAMED
File without changes
{actinet-0.0.dev1 → actinet-0.0.dev3}/README.md RENAMED
File without changes
{actinet-0.0.dev1 → actinet-0.0.dev3}/pyproject.toml RENAMED
File without changes
{actinet-0.0.dev1 → actinet-0.0.dev3}/setup.cfg RENAMED
File without changes
{actinet-0.0.dev1 → actinet-0.0.dev3}/versioneer.py RENAMED
File without changes