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.

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

Pin scipy version #41

Open
wants to merge 427 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
427 commits
Select commit Hold shift + click to select a range
e47cdb6
fixing import statements
annashch-insitro Jun 8, 2021
104e974
fix imports
sebastianpineda Jun 8, 2021
cc8e230
fix imports
sebastianpineda Jun 8, 2021
accca50
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Jun 8, 2021
6bfb8f7
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Jun 8, 2021
4fe05fb
Merge pull request #18 from shmohammadi86/python-devel
annashcherbina Jun 8, 2021
e804356
Merge pull request #18 from shmohammadi86/python-devel
annashcherbina Jun 8, 2021
12d85f4
purging test datasets
annashch-insitro Jun 8, 2021
84e69d8
purging test datasets
annashch-insitro Jun 8, 2021
ad49ee5
gitignore
sebastianpineda Jun 8, 2021
75a9209
gitignore
sebastianpineda Jun 8, 2021
b3e139f
remove junk
sebastianpineda Jun 8, 2021
5347376
remove junk
sebastianpineda Jun 8, 2021
259b8ab
updated docs
annashch-insitro Jun 8, 2021
712db28
updated docs
annashch-insitro Jun 8, 2021
d4a3993
restoring multi-dist wrapper
annashch-insitro Jun 8, 2021
12ec533
restoring multi-dist wrapper
annashch-insitro Jun 8, 2021
89d7467
pseudo-bulk wrapper
annashch-insitro Jun 8, 2021
086a32f
pseudo-bulk wrapper
annashch-insitro Jun 8, 2021
44850a9
distance metrics in wrapper.cc
annashch-insitro Jun 8, 2021
0eaa9b6
distance metrics in wrapper.cc
annashch-insitro Jun 8, 2021
86c7df7
Updated build_ACTIONet signature
shmohammadi86 Jun 8, 2021
313a748
Updated build_ACTIONet signature
shmohammadi86 Jun 8, 2021
ffff3c4
debug & sphinx docs
annashch-insitro Jun 8, 2021
f51d77b
debug & sphinx docs
annashch-insitro Jun 8, 2021
ecccfd4
merge conflict resolve
annashch-insitro Jun 8, 2021
45ed26f
merge conflict resolve
annashch-insitro Jun 8, 2021
b224278
Merge pull request #19 from shmohammadi86/python-devel
annashcherbina Jun 8, 2021
7eb59af
Merge pull request #19 from shmohammadi86/python-devel
annashcherbina Jun 8, 2021
d4f85fd
udpated docs
annashch-insitro Jun 8, 2021
92a4f9c
udpated docs
annashch-insitro Jun 8, 2021
f2829d1
updated docs
annashch-insitro Jun 8, 2021
7aed1c9
updated docs
annashch-insitro Jun 8, 2021
f815b53
updated makefile
annashch-insitro Jun 8, 2021
f1d4066
updated makefile
annashch-insitro Jun 8, 2021
6c5dc15
update
annashch-insitro Jun 8, 2021
d902672
update
annashch-insitro Jun 8, 2021
860741e
trying to get docstrings to show
annashch-insitro Jun 9, 2021
596a9e9
trying to get docstrings to show
annashch-insitro Jun 9, 2021
90d098c
testing sphinx
annashch-insitro Jun 9, 2021
8af10a8
testing sphinx
annashch-insitro Jun 9, 2021
ee46084
desperation
annashch-insitro Jun 9, 2021
ffa20cc
desperation
annashch-insitro Jun 9, 2021
15dbad8
a
annashch-insitro Jun 9, 2021
5040625
a
annashch-insitro Jun 9, 2021
94fee44
removed nbsphinx for now
annashch-insitro Jun 9, 2021
48ac18e
removed nbsphinx for now
annashch-insitro Jun 9, 2021
f629959
a
annashch-insitro Jun 9, 2021
92fdbfb
a
annashch-insitro Jun 9, 2021
785004e
a
annashch-insitro Jun 9, 2021
48f4754
a
annashch-insitro Jun 9, 2021
70b5a02
adding myst_parser
annashch-insitro Jun 9, 2021
0573c04
adding myst_parser
annashch-insitro Jun 9, 2021
42e6f59
fixing merge conflict
annashch-insitro Jun 9, 2021
e44dfa6
fixing merge conflict
annashch-insitro Jun 9, 2021
0dfe883
plotting backend
sebastianpineda Jun 9, 2021
da20bf2
plotting backend
sebastianpineda Jun 9, 2021
ac112dd
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Jun 9, 2021
46281c5
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Jun 9, 2021
e6fb8a7
plot_ACTIONet working
sebastianpineda Jun 14, 2021
bc96031
plot_ACTIONet working
sebastianpineda Jun 14, 2021
b7dd3dc
Bug fix and plot_ACTIONet docstring
sebastianpineda Jun 14, 2021
eb0c172
Bug fix and plot_ACTIONet docstring
sebastianpineda Jun 14, 2021
91e7e9d
Update wrappers
sebastianpineda Jun 16, 2021
9a7083d
Update wrappers
sebastianpineda Jun 16, 2021
f9fbcfc
nbsphinx + changelog
annashch-insitro Jun 22, 2021
ac90e45
nbsphinx + changelog
annashch-insitro Jun 22, 2021
c9d8766
no errors/warnings in ReadTheDocs
Jun 22, 2021
14bf9c9
no errors/warnings in ReadTheDocs
Jun 22, 2021
0000b86
Merge branch 'python-release' into python-devel
annashcherbina Jun 22, 2021
c47da25
Merge branch 'python-release' into python-devel
annashcherbina Jun 22, 2021
cce1e29
updated requirements.txt file for building actionet docs
Jun 22, 2021
19c134d
updated requirements.txt file for building actionet docs
Jun 22, 2021
ea4bbb1
temp build fix
sebastianpineda Jun 24, 2021
e812cbc
temp build fix
sebastianpineda Jun 24, 2021
84a7d81
Merge remote-tracking branch 'origin/python-devel' into python-devel
sebastianpineda Jun 24, 2021
8f3e9d3
Merge remote-tracking branch 'origin/python-devel' into python-devel
sebastianpineda Jun 24, 2021
afd5535
build fix
sebastianpineda Jun 25, 2021
e11e538
build fix
sebastianpineda Jun 25, 2021
55ff70e
moved M, ef to defaults
Jun 25, 2021
18a6c67
moved M, ef to defaults
Jun 25, 2021
67e8a54
unification fix
sebastianpineda Jun 25, 2021
b389d56
unification fix
sebastianpineda Jun 25, 2021
cb3593a
core pipeline fixed
sebastianpineda Jun 25, 2021
bd1af15
core pipeline fixed
sebastianpineda Jun 25, 2021
106ae3d
added k argument to run_ACTIONet function
Jun 30, 2021
2284523
added k argument to run_ACTIONet function
Jun 30, 2021
35f874a
mini docker lives in actionet organization
Jul 1, 2021
996451d
mini docker lives in actionet organization
Jul 1, 2021
50cd16b
Updated a bunch of C++ files
mohammadi-insitro Jul 25, 2021
2a275c5
Updated a bunch of C++ files
mohammadi-insitro Jul 25, 2021
b8b689a
Added submodule core
shmohammadi86 Jul 25, 2021
d5cc776
Added submodule core
shmohammadi86 Jul 25, 2021
c2a3fd9
removed core
shmohammadi86 Jul 25, 2021
4cc74f0
removed core
shmohammadi86 Jul 25, 2021
9f99a37
removed sub
shmohammadi86 Jul 25, 2021
fea88b0
removed sub
shmohammadi86 Jul 25, 2021
5457689
Added ACTIONet core submodule
shmohammadi86 Jul 25, 2021
e9bfc8b
Added ACTIONet core submodule
shmohammadi86 Jul 25, 2021
291c277
Removed submodule path
shmohammadi86 Jul 25, 2021
ee31f68
Removed submodule path
shmohammadi86 Jul 25, 2021
1f89603
Updated CMake
shmohammadi86 Jul 26, 2021
c0a6e2a
Updated CMake
shmohammadi86 Jul 26, 2021
1c036dc
Added setup_helpters.py
shmohammadi86 Jul 26, 2021
f6e4172
Added setup_helpters.py
shmohammadi86 Jul 26, 2021
eee99bd
Added pybind11 include folder
shmohammadi86 Jul 26, 2021
18bf54a
Added pybind11 include folder
shmohammadi86 Jul 26, 2021
048a873
Removed submodule
shmohammadi86 Jul 26, 2021
fa3d8e2
Removed submodule
shmohammadi86 Jul 26, 2021
fd226a8
oops
shmohammadi86 Jul 26, 2021
f25ba7b
oops
shmohammadi86 Jul 26, 2021
0cbf5b9
Readded submodules
shmohammadi86 Jul 26, 2021
aec6e75
Readded submodules
shmohammadi86 Jul 26, 2021
c772f35
Added a bunch of missing function interfaces
shmohammadi86 Jul 28, 2021
796e252
Added a bunch of missing function interfaces
shmohammadi86 Jul 28, 2021
6b46ae9
merge
sebastianpineda Aug 24, 2021
81f7ec8
merge
sebastianpineda Aug 24, 2021
360cf65
testing creation of new notebook in readthedocs
annashch-insitro Oct 13, 2021
49c01d1
testing creation of new notebook in readthedocs
annashch-insitro Oct 13, 2021
f02cbcb
tutorial2
annashch-insitro Oct 14, 2021
ff1f469
tutorial2
annashch-insitro Oct 14, 2021
bb6481e
docs
annashch-insitro Oct 14, 2021
55a31c4
docs
annashch-insitro Oct 14, 2021
3cfa6cd
nb3
annashch-insitro Oct 14, 2021
c9f9b1a
nb3
annashch-insitro Oct 14, 2021
1673ad4
Updated ACTIONet package and added a few decomposition interfaces
shmohammadi86 Oct 17, 2021
c45b42d
Updated ACTIONet package and added a few decomposition interfaces
shmohammadi86 Oct 17, 2021
a7b3e42
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Nov 25, 2021
d67a5ed
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Nov 25, 2021
0d8d4d2
Merge remote-tracking branch 'origin/python-nightly' into python-devel
sebastianpineda Nov 25, 2021
c4b4b70
Merge remote-tracking branch 'origin/python-nightly' into python-devel
sebastianpineda Nov 25, 2021
f7baaa9
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Dec 29, 2021
aaafbc1
meh
sebastianpineda Dec 29, 2021
3e8fabd
Update core commit
sebastianpineda Dec 29, 2021
a92657b
Fix wrappers and layout
sebastianpineda Jan 2, 2022
c9b335c
updating mini-docker, removing docker for python-devel
annashch-insitro Jan 3, 2022
eddaedc
support for napoloean numpy docstring
annashch-insitro Jan 10, 2022
c85a52e
sanity check
annashch-insitro Jan 10, 2022
a827201
pushing to actionet docker
annashch-insitro Jan 10, 2022
d47782b
Fixed compile issue and partially modified decomposition module
shmohammadi86 Jan 10, 2022
c914b14
Updated core module
shmohammadi86 Jan 10, 2022
37f0c2f
Merge branch 'python-devel' of https://github.com/shmohammadi86/ACTIO…
shmohammadi86 Jan 10, 2022
438a49e
Rebased mini-docker
shmohammadi86 Jan 10, 2022
971b011
Rebased mini-docker
shmohammadi86 Jan 10, 2022
6fc7899
Updated apt-get update
shmohammadi86 Jan 10, 2022
262a6f3
added make dependency to mini-docker
shmohammadi86 Jan 10, 2022
d23fd42
added g++ dependency to mini-docker
shmohammadi86 Jan 10, 2022
43170be
Fixed minor issues
shmohammadi86 Jan 10, 2022
5a06dca
meh
sebastianpineda Jan 11, 2022
0f15c0d
Merge branch 'python-devel' of github.com:shmohammadi86/ACTIONet into…
sebastianpineda Jan 11, 2022
c4dedaf
Removed _ACTIONet/ACTIONet.h duplicate
shmohammadi86 Jan 11, 2022
8f3db31
Fixed decomposition classes and CMake
shmohammadi86 Jan 11, 2022
53d421a
Updated core CMake
shmohammadi86 Jan 11, 2022
5e8d9f3
Fixed shit. Still broken.
sebastianpineda Jan 11, 2022
72ba275
Re-organized decomposition-based functions
shmohammadi86 Jan 12, 2022
5ff54fe
Fix type
sebastianpineda Jan 11, 2022
9b97ad8
Update commit
sebastianpineda Jan 11, 2022
3fa0ac4
Fixed minor issues
shmohammadi86 Jan 13, 2022
9b394f3
fix typos
sebastianpineda Jan 14, 2022
ab6934e
Updated decomposition and network modules
shmohammadi86 Jan 14, 2022
b68563e
meh
sebastianpineda Jan 14, 2022
446dea2
Fixed interfaces for a few network functions
shmohammadi86 Jan 14, 2022
e1ef7ca
Fixed broken shit. Still broken.
sebastianpineda Jan 14, 2022
4930016
Fix typo
sebastianpineda Jan 20, 2022
795c952
In progress. Updated core.
sebastianpineda Jan 20, 2022
ba1da1e
Finish specificity. Updated core.
sebastianpineda Jan 22, 2022
3bf887b
wrapper.cc bug fix.
sebastianpineda Jan 22, 2022
f054dee
Fix core commit
sebastianpineda Feb 7, 2022
9f7beef
Some random shit
sebastianpineda Mar 6, 2022
a8d8174
Update README.md
annashch-insitro Apr 17, 2022
0968246
Fixed a bunch of typos
shmohammadi86 May 1, 2022
eaa76f7
pinning scanpy=1.6.0 and anndata=0.7.4 versions until scanpy back-com…
annashch-insitro May 17, 2022
dc98ba1
Update __init__.py
ricomnl Jul 19, 2022
cb0ac2b
Merge pull request #32 from ricomnl/patch-1
sebastianpineda Jul 22, 2022
0c7f306
Major edits -- done
shmohammadi86 Sep 6, 2022
119218f
Added postprocesing
shmohammadi86 Sep 6, 2022
c4148b0
Fixed issues
shmohammadi86 Sep 8, 2022
4d5769b
semifinal prepub
shmohammadi86 Sep 9, 2022
513ae12
bumping up python & release minor version
annashch-insitro Sep 13, 2022
648ee3a
updating requirements versions; creating a conda yaml file for the env
annashch-insitro Sep 13, 2022
e8869bb
dockerfile, makefile, linting
annashch-insitro Sep 15, 2022
c17732b
Dockerfile builds up until install of actionet itself due to core dep…
annashch-insitro Sep 15, 2022
056e245
changes
shmohammadi86 Sep 15, 2022
3defd57
Merged
shmohammadi86 Sep 15, 2022
d68fcc5
updating dependencies & cleanup Makefile
annashch-insitro Sep 15, 2022
c10460c
submodule init added in Dockerfile for github actions
annashch-insitro Sep 15, 2022
75ec614
make sure actionet env used in Dockerfile RUN commadns
annashch-insitro Sep 15, 2022
1ffe492
cleaning up Docker to avoid conflicting condas and making sure action…
annashch-insitro Sep 15, 2022
09b18ae
flake8 error fixes
annashch-insitro Sep 16, 2022
9da2796
fixing imports to make mypy pass
annashch-insitro Sep 16, 2022
7264bb2
Merged
shmohammadi86 Sep 16, 2022
8965706
Updated core
shmohammadi86 Sep 16, 2022
0ccf16a
Merge branch 'python-devel' of https://github.com/shmohammadi86/ACTIO…
shmohammadi86 Sep 16, 2022
8567902
fixing mypy
annashch-insitro Sep 16, 2022
bf2585d
mypy fixes
annashch-insitro Sep 16, 2022
7afe132
Cells
shmohammadi86 Sep 16, 2022
3f69049
Merge branch 'python-devel' of https://github.com/shmohammadi86/ACTIO…
shmohammadi86 Sep 16, 2022
ddb3dc9
more mypy
annashch-insitro Sep 16, 2022
4dc29f9
adding back imports in inits, per Shahin's request
annashch-insitro Sep 16, 2022
b8c2b71
Merge branch 'python-devel' of https://github.com/shmohammadi86/ACTIO…
shmohammadi86 Sep 16, 2022
e02ffbb
Linting continuous
shmohammadi86 Sep 16, 2022
3e99510
More linting errors fixed
shmohammadi86 Sep 16, 2022
43b5fc7
Removing the usage of get_data_or_split
shmohammadi86 Sep 16, 2022
9e60e17
more linting
shmohammadi86 Sep 16, 2022
fcb5865
linting more
shmohammadi86 Sep 16, 2022
2b3dc4e
mypy fixes
annashch-insitro Sep 17, 2022
6c48911
mypy fixes
annashch-insitro Sep 17, 2022
e849001
linting errors fixed
annashch-insitro Sep 17, 2022
c95a6ea
cleanup
annashch-insitro Sep 19, 2022
8e2ed47
changes needed to build wheels
annashch-insitro Sep 19, 2022
73b7d9c
python req of 3.8 or higher
annashch-insitro Sep 19, 2022
faa74c3
scripts to build wheels; modified Makefile to run clean before install
annashch-insitro Sep 19, 2022
08f9380
make file split install and develop
annashch-insitro Sep 19, 2022
5adbd31
release 0.3
annashch-insitro Sep 19, 2022
ce239c5
fixed normalization issue and harmony requirement
shmohammadi86 Sep 27, 2022
affaac1
Merge branch 'python-devel' of https://github.com/shmohammadi86/ACTIO…
shmohammadi86 Sep 27, 2022
cd39e11
Updated tests
shmohammadi86 Sep 27, 2022
367ecad
Makefile updates, updated docs
annashch-insitro Sep 27, 2022
7a1c906
updated docs
annashch-insitro Sep 27, 2022
47965bf
updated docs
annashch-insitro Sep 27, 2022
9869167
updated docs
annashch-insitro Sep 27, 2022
2d72a5b
Fixed cell annotation and harmony
shmohammadi86 Nov 14, 2022
70fa999
Merge branch 'python-devel' into patch-3
annashch-insitro Nov 15, 2022
482a1a9
Merge pull request #31 from annashch-insitro/patch-3
annashcherbina Nov 15, 2022
1bf44ae
updated pydevel workflow name
annashch-insitro Nov 15, 2022
4a095d4
fixing pip issue
annashch-insitro Nov 15, 2022
a38187a
fixing docker issue with python env version
annashch-insitro Nov 15, 2022
89cca13
release updated with devel, workflow updated
annashch-insitro Nov 15, 2022
050d2ea
Fixed cell annotation
shmohammadi86 Nov 15, 2022
8259d14
Merge branch 'python-devel' into python-release
shmohammadi86 Nov 15, 2022
08b8875
Updated armadillo
shmohammadi86 Dec 17, 2022
317f3a5
Updated armadillo
shmohammadi86 Dec 17, 2022
1d41e5d
removing cmake from requirements.txt in favor of system install
annashch-insitro Dec 17, 2022
09a3693
updated README
annashch-insitro Dec 17, 2022
948f4ac
Merge branch 'python-devel' into python-release
annashch-insitro Dec 17, 2022
c59c4b0
updating Makefile to split out environment remove & create
annashch-insitro Jan 16, 2023
79d29d9
Merge pull request #38 from shmohammadi86/python-devel
annashcherbina Jan 16, 2023
ae3be38
updating core submodule
annashch-insitro Jan 19, 2023
3d78815
updating core submodule
annashch-insitro Jan 19, 2023
569767b
updated arma path
annashch-insitro Apr 19, 2023
81cd828
fixing CMakeList
annashch-insitro Apr 19, 2023
eecd3ab
getting ready for release of 0.4.0
annashch-insitro Jun 8, 2023
a33e17b
edits to work w/ python 3.11
annashch-insitro Jun 8, 2023
2fa6894
fixed arma script
annashch-insitro Jun 8, 2023
d8a3b0f
Merge branch 'python-devel' of https://github.com/shmohammadi86/ACTIO…
annashch-insitro Jun 8, 2023
e80a9e1
fixing install issues
annashch-insitro Jun 9, 2023
ca5b1ba
compiles on mac
annashch-insitro Jun 9, 2023
dc9eb49
update pybind
annashch-insitro Jun 9, 2023
f603b08
updated lib
annashch-insitro Jun 9, 2023
09aee6a
Pin scipy
maarten-devries Aug 10, 2023
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
150 changes: 150 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
---
Language: Cpp
# BasedOnStyle: Google
AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: true
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^<ext/.*\.h>'
Priority: 2
- Regex: '^<.*\.h>'
Priority: 1
- Regex: '^<.*'
Priority: 2
- Regex: '.*'
Priority: 3
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseLabels: true
IndentPPDirectives: None
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Never
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Left
RawStringFormats:
- Language: Cpp
Delimiters:
- cc
- CC
- cpp
- Cpp
- CPP
- 'c++'
- 'C++'
CanonicalDelimiter: ''
BasedOnStyle: google
- Language: TextProto
Delimiters:
- pb
- PB
- proto
- PROTO
EnclosingFunctions:
- EqualsProto
- EquivToProto
- PARSE_PARTIAL_TEXT_PROTO
- PARSE_TEST_PROTO
- PARSE_TEXT_PROTO
- ParseTextOrDie
- ParseTextProtoOrDie
CanonicalDelimiter: ''
BasedOnStyle: google
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Auto
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseTab: Never
...
36 changes: 36 additions & 0 deletions .github/workflows/actionet_python_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: ACTIONet-py-release
on:
push:
branches:
- 'python-release'
jobs:
main:
runs-on: ubuntu-latest
timeout-minutes: 3000
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Check file existence
id: check_buildx_existence
uses: andstor/file-existence-action@v1
with:
files: "/home/ubuntu/.docker/cli-plugins/docker-buildx"
- name: Set up Docker Buildx
if: steps.check_buildx_existence.outputs.file_exists == 'false'
id: buildx
uses: docker/setup-buildx-action@v1
with:
version: latest
driver-opts: network=host
- name: Login to DockerHub Registry
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- name: Build and push latest docker
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
push: true
build-args: GITHUB_PAT=${{ secrets.GITHUB_TOKEN }}
tags: actionet/python_release:latest
15 changes: 14 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,17 @@
~*
*.so
*.a

test/
dist/
ACTIONet.egg-info/
build/
data/
!ACTIONet/data
.vscode
__pycache__
.ipynb_checkpoints
.idea/
**/.DS_Store
docker_insitro.txt
tests/tmp
tests/data
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[submodule "lib/pybind11"]
path = lib/pybind11
url = https://github.com/pybind/pybind11
branch = v2.10
[submodule "lib/ACTIONet"]
path = lib/ACTIONet
url = https://github.com/shmohammadi86/ACTIONet.git
branch = core
39 changes: 39 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
repos:
# YAML linting and general cleanups
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
# Flake8: Python linter
- repo: https://github.com/pycqa/flake8
rev: "3.9.2"
hooks:
- id: flake8
exclude: (ACTIONet/plotting/__init__.py|ACTIONet/__init__.py|ACTIONet/decomposition/__init__.py|ACTIONet/preprocessing/__init__.py|ACTIONet/tools/__init__.py|ACTIONet/network/__init__.py|ACTIONet/postprocessing/__init__.py)
args:
- "--max-line-length=500"
- "--ignore=E203"

# Isort: Python import linter/formatter
- repo: https://github.com/pycqa/isort
rev: 5.8.0
hooks:
- id: isort
name: isort (python)
types: [ python ]
args: ["--profile", "black"]
# Black: Python code formatter
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
args:
- --line-length=500
# Mypy: Python type-checking
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.910
hooks:
- id: mypy
additional_dependencies: [ types-toml==0.1.5 ]
11 changes: 11 additions & 0 deletions ACTIONet/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
__version__ = "0.4.1"
__author__ = ", ".join(["Shahin Mohammadi"])
__email__ = ", ".join(["[email protected]"])

from . import decomposition as dc
from . import network as nt
from . import plotting as pl
from . import postprocessing as po
from . import preprocessing as pp
from . import tools as tl
from .main import *
4 changes: 4 additions & 0 deletions ACTIONet/decomposition/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from .aa import *
from .action import *
from .actionmr import *
from .spa import *
Loading