Skip to content
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

Refactor training loop from script to class #40

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
from PIL import Image
import torch
from torchvision import transforms
from main import Net # Importing Net class from main.py
from main import MNISTTrainer # Importing MNISTTrainer class from main.py

# Load the model
model = Net()
# Initialize the trainer and load the model
trainer = MNISTTrainer()
model = trainer.define_model()
model.load_state_dict(torch.load("mnist_model.pth"))
model.eval()

Expand Down
105 changes: 65 additions & 40 deletions src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,68 @@
from torch.utils.data import DataLoader
import numpy as np

# Step 1: Load MNIST Data and Preprocess
transform = transforms.Compose([
transforms.ToTensor(),
transforms.Normalize((0.5,), (0.5,))
])

trainset = datasets.MNIST('.', download=True, train=True, transform=transform)
trainloader = DataLoader(trainset, batch_size=64, shuffle=True)

# Step 2: Define the PyTorch Model
class Net(nn.Module):
def __init__(self):
super().__init__()
self.fc1 = nn.Linear(28 * 28, 128)
self.fc2 = nn.Linear(128, 64)
self.fc3 = nn.Linear(64, 10)

def forward(self, x):
x = x.view(-1, 28 * 28)
x = nn.functional.relu(self.fc1(x))
x = nn.functional.relu(self.fc2(x))
x = self.fc3(x)
return nn.functional.log_softmax(x, dim=1)

# Step 3: Train the Model
model = Net()
optimizer = optim.SGD(model.parameters(), lr=0.01)
criterion = nn.NLLLoss()

# Training loop
epochs = 3
for epoch in range(epochs):
for images, labels in trainloader:
optimizer.zero_grad()
output = model(images)
loss = criterion(output, labels)
loss.backward()
optimizer.step()

torch.save(model.state_dict(), "mnist_model.pth")
class MNISTTrainer:
"""A class for training a PyTorch model on the MNIST dataset."""

def load_data(self):
"""Load and preprocess the MNIST dataset.

Returns:
DataLoader: A DataLoader for the MNIST dataset.
"""
transform = transforms.Compose([
transforms.ToTensor(),
transforms.Normalize((0.5,), (0.5,))
])

trainset = datasets.MNIST('.', download=True, train=True, transform=transform)
trainloader = DataLoader(trainset, batch_size=64, shuffle=True)
return trainloader

def define_model(self):
"""Define the PyTorch model.

Returns:
Net: The PyTorch model.
"""
class Net(nn.Module):
def __init__(self):
super().__init__()
self.fc1 = nn.Linear(28 * 28, 128)
self.fc2 = nn.Linear(128, 64)
self.fc3 = nn.Linear(64, 10)

def forward(self, x):
x = x.view(-1, 28 * 28)
x = nn.functional.relu(self.fc1(x))
x = nn.functional.relu(self.fc2(x))
x = self.fc3(x)
return nn.functional.log_softmax(x, dim=1)

return Net()

def train(self, trainloader, model):
"""Train the model on the MNIST dataset.

Args:
trainloader (DataLoader): The DataLoader for the MNIST dataset.
model (Net): The PyTorch model.
"""
optimizer = optim.SGD(model.parameters(), lr=0.01)
criterion = nn.NLLLoss()

epochs = 3
for epoch in range(epochs):
for images, labels in trainloader:
optimizer.zero_grad()
output = model(images)
loss = criterion(output, labels)
loss.backward()
optimizer.step()

torch.save(model.state_dict(), "mnist_model.pth")

trainer = MNISTTrainer()
trainloader = trainer.load_data()
model = trainer.define_model()
trainer.train(trainloader, model)
Loading