Skip to content

Commit 20e0c2e

Browse files
LdDlLdDl
committed
camel case
1 parent 2afe66b commit 20e0c2e

File tree

4 files changed

+42
-38
lines changed

4 files changed

+42
-38
lines changed

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- [Why](#why)
99
- [Instruments](#instruments)
1010
- [Usage](#usage)
11+
- [Code explanation](#code-explanation)
1112
- [Support and contributing](#support-and-contributing)
1213

1314
## About
@@ -88,6 +89,9 @@ Plotting library - [gonum](https://github.com/gonum/plot#gonum-plot)
8889
![Generated data on last epoch](cmd/examples/parabola/output/gen_reference_func_final.png)
8990

9091

92+
## Code explanation
93+
@TODO
94+
9195
## Support and contributing
9296
If you have troubles or questions please [open an issue](https://github.com/LdDl/gan-go/issues/new).
9397

‎cmd/examples/parabola/main.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,20 @@ func main() {
8080

8181
/* Define variables for reading evaluation graphs' (both GAN and Discriminator in training mode) output */
8282
// GAN Generator output
83-
var generated_samples gorgonia.Value
84-
gorgonia.Read(definedGAN.GeneratorOut(), &generated_samples)
83+
var generatedSamples gorgonia.Value
84+
gorgonia.Read(definedGAN.GeneratorOut(), &generatedSamples)
8585

8686
// GAN overall output (Discriminator output actually)
87-
var output_discriminator gorgonia.Value
88-
gorgonia.Read(definedGAN.Out(), &output_discriminator)
87+
var outputDiscriminator gorgonia.Value
88+
gorgonia.Read(definedGAN.Out(), &outputDiscriminator)
8989

9090
// Discriminator output in training mode
91-
var output_discriminator_train gorgonia.Value
92-
gorgonia.Read(discriminatorTrain.Out(), &output_discriminator_train)
91+
var outputDiscriminatorTrain gorgonia.Value
92+
gorgonia.Read(discriminatorTrain.Out(), &outputDiscriminatorTrain)
9393

9494
// Initialize machine for GAN evaluation graph
95-
tmFFonly := gorgonia.NewTapeMachine(ganGraph)
96-
defer tmFFonly.Close()
95+
tmGenerator := gorgonia.NewTapeMachine(ganGraph)
96+
defer tmGenerator.Close()
9797

9898
// Define loss function for GAN as
9999
// loss{i} = (gan_out{i} - target{i})^2
@@ -198,25 +198,25 @@ func main() {
198198
}
199199

200200
real_samples_labels := tensor.Ones(tensor.Float64, batchSize, 1)
201-
latent_space_samples := gan.NormRandDense(batchSize, 2)
202-
err = gorgonia.Let(inputGenerator, latent_space_samples)
201+
latentSpaceSamples := gan.NormRandDense(batchSize, 2)
202+
err = gorgonia.Let(inputGenerator, latentSpaceSamples)
203203
if err != nil {
204204
panic(err)
205205
}
206206

207-
// Do step on evaluation graph for obtaining 'generated_samples' (Generator output)
208-
err = tmFFonly.RunAll()
207+
// Do step on evaluation graph for obtaining 'generatedSamples' (Generator output)
208+
err = tmGenerator.RunAll()
209209
if err != nil {
210210
panic(err)
211211
}
212-
tmFFonly.Reset()
212+
tmGenerator.Reset()
213213

214214
// Assume that Generator generates wrong data, and label its output as zero
215215
generated_samples_labels := tensor.Ones(tensor.Float64, batchSize, 1)
216216
generated_samples_labels.Zero()
217217

218218
// Concat real and fake input data
219-
all_samples, err := tensor.Concat(0, xVal, generated_samples.(tensor.Tensor))
219+
all_samples, err := tensor.Concat(0, xVal, generatedSamples.(tensor.Tensor))
220220
if err != nil {
221221
panic(err)
222222
}
@@ -246,8 +246,8 @@ func main() {
246246
}
247247
tmDisTrain.Reset()
248248

249-
latent_space_samples_gen := gan.NormRandDense(batchSize, 2)
250-
err = gorgonia.Let(inputGenerator, latent_space_samples_gen)
249+
latentSpaceSamplesGenerated := gan.NormRandDense(batchSize, 2)
250+
err = gorgonia.Let(inputGenerator, latentSpaceSamplesGenerated)
251251
if err != nil {
252252
panic(err)
253253
}
@@ -272,7 +272,7 @@ func main() {
272272
fmt.Printf("\tGenerator's loss: %v\n", costValGAN)
273273
fmt.Printf("\tTaken time: %v\n", time.Since(st))
274274

275-
testSamplesTensor, err := gan.GenerateTestSamples(tmFFonly, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generated_samples, numTestSamples, batchSize, 2)
275+
testSamplesTensor, err := gan.GenerateTestSamples(tmGenerator, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generatedSamples, numTestSamples, batchSize, 2)
276276
if err != nil {
277277
panic(err)
278278
}
@@ -296,7 +296,7 @@ func main() {
296296

297297
// Final test of Generator
298298
fmt.Println("Start testing generator after final epoch")
299-
testSamplesTensor, err := gan.GenerateTestSamples(tmFFonly, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generated_samples, numTestSamples, batchSize, 2)
299+
testSamplesTensor, err := gan.GenerateTestSamples(tmGenerator, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generatedSamples, numTestSamples, batchSize, 2)
300300
if err != nil {
301301
panic(err)
302302
}

‎cmd/examples/sin/main.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,20 @@ func main() {
8080

8181
/* Define variables for reading evaluation graphs' (both GAN and Discriminator in training mode) output */
8282
// GAN Generator output
83-
var generated_samples gorgonia.Value
84-
gorgonia.Read(definedGAN.GeneratorOut(), &generated_samples)
83+
var generatedSamples gorgonia.Value
84+
gorgonia.Read(definedGAN.GeneratorOut(), &generatedSamples)
8585

8686
// GAN overall output (Discriminator output actually)
87-
var output_discriminator gorgonia.Value
88-
gorgonia.Read(definedGAN.Out(), &output_discriminator)
87+
var outputDiscriminator gorgonia.Value
88+
gorgonia.Read(definedGAN.Out(), &outputDiscriminator)
8989

9090
// Discriminator output in training mode
91-
var output_discriminator_train gorgonia.Value
92-
gorgonia.Read(discriminatorTrain.Out(), &output_discriminator_train)
91+
var outputDiscriminatorTrain gorgonia.Value
92+
gorgonia.Read(discriminatorTrain.Out(), &outputDiscriminatorTrain)
9393

9494
// Initialize machine for GAN evaluation graph
95-
tmFFonly := gorgonia.NewTapeMachine(ganGraph)
96-
defer tmFFonly.Close()
95+
tmGenerator := gorgonia.NewTapeMachine(ganGraph)
96+
defer tmGenerator.Close()
9797

9898
// Define loss function for GAN as
9999
// loss{i} = (gan_out{i} - target{i})^2
@@ -198,25 +198,25 @@ func main() {
198198
}
199199

200200
real_samples_labels := tensor.Ones(tensor.Float64, batchSize, 1)
201-
latent_space_samples := gan.NormRandDense(batchSize, 2)
202-
err = gorgonia.Let(inputGenerator, latent_space_samples)
201+
latentSpaceSamples := gan.NormRandDense(batchSize, 2)
202+
err = gorgonia.Let(inputGenerator, latentSpaceSamples)
203203
if err != nil {
204204
panic(err)
205205
}
206206

207-
// Do step on evaluation graph for obtaining 'generated_samples' (Generator output)
208-
err = tmFFonly.RunAll()
207+
// Do step on evaluation graph for obtaining 'generatedSamples' (Generator output)
208+
err = tmGenerator.RunAll()
209209
if err != nil {
210210
panic(err)
211211
}
212-
tmFFonly.Reset()
212+
tmGenerator.Reset()
213213

214214
// Assume that Generator generates wrong data, and label its output as zero
215215
generated_samples_labels := tensor.Ones(tensor.Float64, batchSize, 1)
216216
generated_samples_labels.Zero()
217217

218218
// Concat real and fake input data
219-
all_samples, err := tensor.Concat(0, xVal, generated_samples.(tensor.Tensor))
219+
all_samples, err := tensor.Concat(0, xVal, generatedSamples.(tensor.Tensor))
220220
if err != nil {
221221
panic(err)
222222
}
@@ -246,8 +246,8 @@ func main() {
246246
}
247247
tmDisTrain.Reset()
248248

249-
latent_space_samples_gen := gan.NormRandDense(batchSize, 2)
250-
err = gorgonia.Let(inputGenerator, latent_space_samples_gen)
249+
latentSpaceSamplesGenerated := gan.NormRandDense(batchSize, 2)
250+
err = gorgonia.Let(inputGenerator, latentSpaceSamplesGenerated)
251251
if err != nil {
252252
panic(err)
253253
}
@@ -273,7 +273,7 @@ func main() {
273273
fmt.Printf("\tTaken time: %v\n", time.Since(st))
274274
st = time.Now()
275275

276-
testSamplesTensor, err := gan.GenerateTestSamples(tmFFonly, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generated_samples, numTestSamples, batchSize, 2)
276+
testSamplesTensor, err := gan.GenerateTestSamples(tmGenerator, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generatedSamples, numTestSamples, batchSize, 2)
277277
if err != nil {
278278
panic(err)
279279
}
@@ -297,7 +297,7 @@ func main() {
297297

298298
// Final test of Generator
299299
fmt.Println("Start testing generator after final epoch")
300-
testSamplesTensor, err := gan.GenerateTestSamples(tmFFonly, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generated_samples, numTestSamples, batchSize, 2)
300+
testSamplesTensor, err := gan.GenerateTestSamples(tmGenerator, tmDisTrain, inputGenerator, inputDiscriminatorTrain, generatedSamples, numTestSamples, batchSize, 2)
301301
if err != nil {
302302
panic(err)
303303
}

‎utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ func GenerateTestSamples(vmGenerator, vmDiscriminator gorgonia.VM, inputGenerato
132132
var testSamplesTensor *tensor.Dense
133133

134134
for i := 0; i < numSamples; i++ {
135-
latent_space_samples := NormRandDense(batchSize, n)
136-
err := gorgonia.Let(inputGenerator, latent_space_samples)
135+
latentSpaceSamples := NormRandDense(batchSize, n)
136+
err := gorgonia.Let(inputGenerator, latentSpaceSamples)
137137
if err != nil {
138138
return nil, errors.Wrap(err, "Can't init input value")
139139
}

0 commit comments

Comments
 (0)