Removed Conv2D because it can be done using just Conv3D and renamed Conv3D to Conv2D to correspond to the spatial conv dimenson not the scene dimension, which is more inline with convention.

This commit is contained in:
Alec Helbling
2023-01-15 14:35:26 +09:00
parent ba63116b37
commit 42b6e37b16
23 changed files with 358 additions and 467 deletions

View File

@ -3,7 +3,7 @@ from pathlib import Path
from manim import *
from PIL import Image
from manim_ml.neural_network.layers.convolutional3d import Convolutional3DLayer
from manim_ml.neural_network.layers.convolutional_2d import Convolutional2DLayer
from manim_ml.neural_network.layers.feed_forward import FeedForwardLayer
from manim_ml.neural_network.layers.image import ImageLayer
from manim_ml.neural_network.neural_network import NeuralNetwork
@ -21,9 +21,9 @@ def make_code_snippet():
# Make nn
nn = NeuralNetwork([
ImageLayer(numpy_image, height=1.5),
Convolutional3DLayer(1, 7, 7, 3, 3),
Convolutional3DLayer(3, 5, 5, 3, 3),
Convolutional3DLayer(5, 3, 3, 1, 1),
Convolutional2DLayer(1, 7, 7, 3, 3),
Convolutional2DLayer(3, 5, 5, 3, 3),
Convolutional2DLayer(5, 3, 3, 1, 1),
FeedForwardLayer(3),
FeedForwardLayer(3),
])
@ -54,9 +54,9 @@ class CombinedScene(ThreeDScene):
nn = NeuralNetwork(
[
ImageLayer(numpy_image, height=1.5),
Convolutional3DLayer(1, 7, 7, 3, 3, filter_spacing=0.32),
Convolutional3DLayer(3, 5, 5, 3, 3, filter_spacing=0.32),
Convolutional3DLayer(5, 3, 3, 1, 1, filter_spacing=0.18),
Convolutional2DLayer(1, 7, 7, 3, 3, filter_spacing=0.32),
Convolutional2DLayer(3, 5, 5, 3, 3, filter_spacing=0.32),
Convolutional2DLayer(5, 3, 3, 1, 1, filter_spacing=0.18),
FeedForwardLayer(3),
FeedForwardLayer(3),
],