-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Made python interface installable via pip #143
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
Open
AlreadyTakenJonas
wants to merge
23
commits into
HarisIqbal88:master
Choose a base branch
from
AlreadyTakenJonas:installer
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
9b6a517
created installable python package
213c34a
Added citation
8aaa2ae
made setup.py build one single module for core and examples
7914653
fixed no exported attributes issue
f21e74b
made paths relative
404caff
does this fix it?
fd314e8
fixing stuff
5a288bd
still fixing
496dcbf
fixing
fdbca8e
fixing
409aa01
fixing
7012e85
fixing some more
c76f1ae
added dist to gitignore. created by pip
7a6ac1e
fixing
39db1ef
fixing
05f2e91
fixing?
d1d5202
fixed import of examples
e29d1ea
fix pycore import
119ec6b
added __version__ to export
e14da0a
updated readme
e209faf
Update README.md
AlreadyTakenJonas 4226e11
fixed issue of missing sty files
b357897
added layer dir to package. finally fixed
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| cff-version: 1.2.0 | ||
| message: "If you use this software, please cite it as below." | ||
| authors: | ||
| - family-names: "HarisIqbal88" | ||
| given-names: "" | ||
| orcid: "" | ||
| title: "PlotNeuralNet" | ||
| version: 1.0.0 | ||
| doi: "10.5281/zenodo.2526396" | ||
| date-released: 2018-12-25 | ||
| url: "https://github.com/HarisIqbal88/PlotNeuralNet/tree/v1.0.0" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/usr/bin/env python3 | ||
| # -*- coding: utf-8 -*- | ||
| from . import pycore | ||
| from . import pyexamples | ||
| from .__version__ import __version__ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| __version__ = "1.0.0" | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/usr/bin/env python3 | ||
| # -*- coding: utf-8 -*- | ||
| from .blocks import block_2ConvPool, block_Unconv, block_Res | ||
| from .tikzeng import * |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/usr/bin/env python3 | ||
| # -*- coding: utf-8 -*- | ||
| from .test_simple import main, arch | ||
| from .unet import main, arch | ||
5 changes: 2 additions & 3 deletions
5
pyexamples/test_simple.py → PlotNeuralNetPy/pyexamples/test_simple.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
|
|
||
| \documentclass[border=8pt, multi, tikz]{standalone} | ||
| \usepackage{import} | ||
| \subimport{C:/Users/jonas/code/PlotNeuralNet/PlotNeuralNetPy/layers/}{init} | ||
| \usetikzlibrary{positioning} | ||
| \usetikzlibrary{3d} %for including external image | ||
|
|
||
| \def\ConvColor{rgb:yellow,5;red,2.5;white,5} | ||
| \def\ConvReluColor{rgb:yellow,5;red,5;white,5} | ||
| \def\PoolColor{rgb:red,1;black,0.3} | ||
| \def\UnpoolColor{rgb:blue,2;green,1;black,0.3} | ||
| \def\FcColor{rgb:blue,5;red,2.5;white,5} | ||
| \def\FcReluColor{rgb:blue,5;red,5;white,4} | ||
| \def\SoftmaxColor{rgb:magenta,5;black,7} | ||
| \def\SumColor{rgb:blue,5;green,15} | ||
|
|
||
| \newcommand{\copymidarrow}{\tikz \draw[-Stealth,line width=0.8mm,draw={rgb:blue,4;red,1;green,1;black,3}] (-0.3,0) -- ++(0.3,0);} | ||
|
|
||
| \begin{document} | ||
| \begin{tikzpicture} | ||
| \tikzstyle{connection}=[ultra thick,every node/.style={sloped,allow upside down},draw=\edgecolor,opacity=0.7] | ||
| \tikzstyle{copyconnection}=[ultra thick,every node/.style={sloped,allow upside down},draw={rgb:blue,4;red,1;green,1;black,3},opacity=0.7] | ||
|
|
||
| \pic[shift={(0,0,0)}] at (0,0,0) | ||
| {Box={ | ||
| name=conv1, | ||
| caption= , | ||
| xlabel={{64, }}, | ||
| zlabel=512, | ||
| fill=\ConvColor, | ||
| height=64, | ||
| width=2, | ||
| depth=64 | ||
| } | ||
| }; | ||
|
|
||
| \pic[shift={ (0,0,0) }] at (conv1-east) | ||
| {Box={ | ||
| name=pool1, | ||
| caption= , | ||
| fill=\PoolColor, | ||
| opacity=0.5, | ||
| height=32, | ||
| width=1, | ||
| depth=32 | ||
| } | ||
| }; | ||
|
|
||
| \pic[shift={(1,0,0)}] at (pool1-east) | ||
| {Box={ | ||
| name=conv2, | ||
| caption= , | ||
| xlabel={{64, }}, | ||
| zlabel=128, | ||
| fill=\ConvColor, | ||
| height=32, | ||
| width=2, | ||
| depth=32 | ||
| } | ||
| }; | ||
|
|
||
| \draw [connection] (pool1-east) -- node {\midarrow} (conv2-west); | ||
|
|
||
| \pic[shift={ (0,0,0) }] at (conv2-east) | ||
| {Box={ | ||
| name=pool2, | ||
| caption= , | ||
| fill=\PoolColor, | ||
| opacity=0.5, | ||
| height=28, | ||
| width=1, | ||
| depth=28 | ||
| } | ||
| }; | ||
|
|
||
| \pic[shift={(3,0,0)}] at (pool1-east) | ||
| {Box={ | ||
| name=soft1, | ||
| caption=SOFT, | ||
| xlabel={{" ","dummy"}}, | ||
| zlabel=10, | ||
| fill=\SoftmaxColor, | ||
| opacity=0.8, | ||
| height=3, | ||
| width=1.5, | ||
| depth=25 | ||
| } | ||
| }; | ||
|
|
||
| \draw [connection] (pool2-east) -- node {\midarrow} (soft1-west); | ||
|
|
||
| \pic[shift={(1.5,0,0)}] at (soft1-east) | ||
| {Ball={ | ||
| name=sum1, | ||
| fill=\SumColor, | ||
| opacity=0.6, | ||
| radius=2.5, | ||
| logo=$+$ | ||
| } | ||
| }; | ||
|
|
||
| \draw [connection] (soft1-east) -- node {\midarrow} (sum1-west); | ||
|
|
||
| \end{tikzpicture} | ||
| \end{document} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| \ProvidesPackage{Ball} | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| %This Block can draw small Ball | ||
| %Elementwise or reduction operations can be drawn with this | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| \tikzset{Ball/.pic={\tikzset{/sphere/.cd,#1} | ||
| \pgfmathsetmacro{\r}{\radius*\scale} | ||
| \shade[ball color=\fill,opacity=\opacity] (0,0,0) circle (\r); | ||
| \draw (0,0,0) circle [radius=\r] node[scale=4*\r] {\logo}; | ||
| \coordinate (\name-anchor) at ( 0 , 0 , 0) ; | ||
| \coordinate (\name-east) at ( \r, 0 , 0) ; | ||
| \coordinate (\name-west) at (-\r, 0 , 0) ; | ||
| \coordinate (\name-north) at ( 0 , \r , 0) ; | ||
| \coordinate (\name-south) at ( 0 , -\r, 0) ; | ||
| \path (\name-south) + (0,-20pt) coordinate (caption-node) | ||
| edge ["\textcolor{black}{\bf \caption}"'] (caption-node); %Ball caption | ||
| }, | ||
| /sphere/.search also={/tikz}, | ||
| /sphere/.cd, | ||
| radius/.store in=\radius, | ||
| scale/.store in=\scale, | ||
| caption/.store in=\caption, | ||
| name/.store in=\name, | ||
| fill/.store in=\fill, | ||
| logo/.store in=\logo, | ||
| opacity/.store in=\opacity, | ||
| logo=$\Sigma$, | ||
| fill=green, | ||
| opacity=0.10, | ||
| scale=0.2, | ||
| radius=0.5, | ||
| caption=, | ||
| name=, | ||
| } | ||
| \ProvidesPackage{Ball} | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| %This Block can draw small Ball | ||
| %Elementwise or reduction operations can be drawn with this | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
|
|
||
| \tikzset{Ball/.pic={\tikzset{/sphere/.cd,#1} | ||
|
|
||
| \pgfmathsetmacro{\r}{\radius*\scale} | ||
|
|
||
| \shade[ball color=\fill,opacity=\opacity] (0,0,0) circle (\r); | ||
| \draw (0,0,0) circle [radius=\r] node[scale=4*\r] {\logo}; | ||
|
|
||
| \coordinate (\name-anchor) at ( 0 , 0 , 0) ; | ||
| \coordinate (\name-east) at ( \r, 0 , 0) ; | ||
| \coordinate (\name-west) at (-\r, 0 , 0) ; | ||
| \coordinate (\name-north) at ( 0 , \r , 0) ; | ||
| \coordinate (\name-south) at ( 0 , -\r, 0) ; | ||
|
|
||
| \path (\name-south) + (0,-20pt) coordinate (caption-node) | ||
| edge ["\textcolor{black}{\bf \caption}"'] (caption-node); %Ball caption | ||
|
|
||
| }, | ||
| /sphere/.search also={/tikz}, | ||
| /sphere/.cd, | ||
| radius/.store in=\radius, | ||
| scale/.store in=\scale, | ||
| caption/.store in=\caption, | ||
| name/.store in=\name, | ||
| fill/.store in=\fill, | ||
| logo/.store in=\logo, | ||
| opacity/.store in=\opacity, | ||
| logo=$\Sigma$, | ||
| fill=green, | ||
| opacity=0.10, | ||
| scale=0.2, | ||
| radius=0.5, | ||
| caption=, | ||
| name=, | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These imports conflict. No need to import the individual example namespaces into the top
__init__namespace.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Didn't catch that!