fix: 🚑️ Refactor repo to allow proper pip install

janelia-cellmap · Apr 2, 2024 · 7a0bbe6 · 7a0bbe6
1 parent 820f19e
commit 7a0bbe6
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 96 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -15,7 +15,7 @@ classifiers =
 
 [options]
 package_dir=
-    =leibnetz
+    =src
 packages=find:
 zip_safe = True
 include_package_data = True
@@ -25,5 +25,5 @@ install_requires =
     funlib.learn.torch @ git+https://github.com/funkelab/funlib.learn.torch.git
 
 [options.packages.find]
-where=leibnetz
+where=src
 
diff --git a/leibnetz/__init__.py → src/leibnetz/__init__.py b/leibnetz/__init__.py → src/leibnetz/__init__.py
diff --git a/leibnetz/leibnet.py → src/leibnetz/leibnet.py b/leibnetz/leibnet.py → src/leibnetz/leibnet.py
diff --git a/leibnetz/nets/__init__.py → src/leibnetz/nets/__init__.py b/leibnetz/nets/__init__.py → src/leibnetz/nets/__init__.py
diff --git a/leibnetz/nets/attentive_scalenet.py → src/leibnetz/nets/attentive_scalenet.py b/leibnetz/nets/attentive_scalenet.py → src/leibnetz/nets/attentive_scalenet.py
diff --git a/leibnetz/nets/scalenet.py → src/leibnetz/nets/scalenet.py b/leibnetz/nets/scalenet.py → src/leibnetz/nets/scalenet.py
diff --git a/leibnetz/nets/unet.py → src/leibnetz/nets/unet.py b/leibnetz/nets/unet.py → src/leibnetz/nets/unet.py
diff --git a/leibnetz/nodes/__init__.py → src/leibnetz/nodes/__init__.py b/leibnetz/nodes/__init__.py → src/leibnetz/nodes/__init__.py
diff --git a/...etz/nodes/additive_attention_gate_node.py → ...etz/nodes/additive_attention_gate_node.py b/...etz/nodes/additive_attention_gate_node.py → ...etz/nodes/additive_attention_gate_node.py
diff --git a/leibnetz/nodes/conv_pass_node.py → src/leibnetz/nodes/conv_pass_node.py b/leibnetz/nodes/conv_pass_node.py → src/leibnetz/nodes/conv_pass_node.py
diff --git a/leibnetz/nodes/conv_resample_node.py → src/leibnetz/nodes/conv_resample_node.py b/leibnetz/nodes/conv_resample_node.py → src/leibnetz/nodes/conv_resample_node.py
diff --git a/leibnetz/nodes/node.py → src/leibnetz/nodes/node.py b/leibnetz/nodes/node.py → src/leibnetz/nodes/node.py
diff --git a/leibnetz/nodes/node_ops.py → src/leibnetz/nodes/node_ops.py b/leibnetz/nodes/node_ops.py → src/leibnetz/nodes/node_ops.py
diff --git a/leibnetz/nodes/resample_node.py → src/leibnetz/nodes/resample_node.py b/leibnetz/nodes/resample_node.py → src/leibnetz/nodes/resample_node.py
diff --git a/leibnetz/nodes/resample_ops.py → src/leibnetz/nodes/resample_ops.py b/leibnetz/nodes/resample_ops.py → src/leibnetz/nodes/resample_ops.py
diff --git a/tests/leibnet_test.py b/tests/leibnet_test.py
@@ -186,97 +186,3 @@ def test_leibnet_cpu():
 if __name__ == "__main__":
     test_leibnet_cpu()
     test_leibnet_gpu()
-
-# %% [markdown]
-# ```mermaid
-# graph LR
-# 	node-in_conv_0([in_conv_0])
-# 	node-downsample_0[\downsample_0/]
-# 	node-in_conv_1([in_conv_1])
-# 	node-downsample_1[\downsample_1/]
-# 	node-bottleneck([bottleneck])
-# 	node-upsample_1[/upsample_1\]
-# 	node-out_conv_1([out_conv_1])
-# 	node-upsample_0[/upsample_0\]
-# 	node-out_conv_0([out_conv_0])
-# 	node-output([output])
-# 	out_conv_0[out_conv_0: 20x20x20]
-# 	upsample_0[upsample_0: 28x28x28]
-# 	in_conv_0[in_conv_0: 76x76x76]
-# 	out_conv_1[out_conv_1: 14x14x14]
-# 	upsample_1[upsample_1: 20x20x20]
-# 	in_conv_1[in_conv_1: 32x32x32]
-# 	bottleneck[bottleneck: 10x10x10]
-# 	downsample_1[downsample_1: 16x16x16]
-# 	downsample_0[downsample_0: 38x38x38]
-# 	input[input: 82x82x82]
-# 	subgraph 8nmx8nmx8nm
-# 		input---node-in_conv_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		node-in_conv_0-->in_conv_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		in_conv_0-.-node-downsample_0
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		node-downsample_0-.->downsample_0
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		downsample_0---node-in_conv_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		node-in_conv_1-->in_conv_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		in_conv_1-.-node-downsample_1
-# 	end
-# 	subgraph 32nmx32nmx32nm
-# 		node-downsample_1-.->downsample_1
-# 	end
-# 	subgraph 32nmx32nmx32nm
-# 		downsample_1---node-bottleneck
-# 	end
-# 	subgraph 32nmx32nmx32nm
-# 		node-bottleneck-->bottleneck
-# 	end
-# 	subgraph 32nmx32nmx32nm
-# 		bottleneck===node-upsample_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		node-upsample_1==>upsample_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		upsample_1---node-out_conv_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		in_conv_1---node-out_conv_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		node-out_conv_1-->out_conv_1
-# 	end
-# 	subgraph 16nmx16nmx16nm
-# 		out_conv_1===node-upsample_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		node-upsample_0==>upsample_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		upsample_0---node-out_conv_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		in_conv_0---node-out_conv_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		node-out_conv_0-->out_conv_0
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		out_conv_0---node-output
-# 	end
-# 	subgraph 8nmx8nmx8nm
-# 		node-output-->output
-# 	end
-# ```
-
-
-# %%