Update some files

itsubaki · Oct 16, 2023 · 4144e34 · 4144e34
1 parent 1fc5f69
commit 4144e34
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/autograd_test.go b/autograd_test.go
@@ -430,11 +430,11 @@ func Example_mlp() {
 	}
 
 	x := variable.Rand(100, 1, s)
-	y := variable.Rand(100, 1, s)
+	t := variable.Rand(100, 1, s)
 
 	for i := 0; i < 100; i++ {
-		yPred := m.Forward(x)
-		loss := F.MeanSquaredError(y, yPred)
+		y := m.Forward(x)
+		loss := F.MeanSquaredError(y, t)
 
 		m.Cleargrads()
 		loss.Backward()

diff --git a/model/mlp.go b/model/mlp.go
@@ -9,14 +9,14 @@ import (
 	"github.com/itsubaki/autograd/variable"
 )
 
-type MLP struct {
+type MLPOpts struct {
 	Activation Activation
-	Model
+	Source     rand.Source
 }
 
-type MLPOpts struct {
+type MLP struct {
 	Activation Activation
-	Source     rand.Source
+	*Model
 }
 
 func NewMLP(outSize []int, opts ...MLPOpts) *MLP {
@@ -37,11 +37,7 @@ func NewMLP(outSize []int, opts ...MLPOpts) *MLP {
 
 	return &MLP{
 		Activation: activation,
-		Model: Model{
-			Layer: L.Layer{
-				Layers: layers,
-			},
-		},
+		Model:      NewModel(layers),
 	}
 }
 

diff --git a/model/model.go b/model/model.go
@@ -10,6 +10,14 @@ type Model struct {
 	L.Layer
 }
 
+func NewModel(layers []*L.Layer) *Model {
+	return &Model{
+		Layer: L.Layer{
+			Layers: layers,
+		},
+	}
+}
+
 func (m Model) graph(y *variable.Variable, opt ...dot.Opt) []string {
 	out := make([]string, 0)
 	for _, txt := range dot.Graph(y, opt...) {