Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci_test-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
# os: [ubuntu-20.04]
python-version: [3.7]
pytorch-version: [1.4, 1.5, 1.6, 1.7, 1.8, 1.9]
pytorch-version: [1.4, 1.5, 1.6, 1.7, 1.8] # todo: add back 1.9
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just to have green badges or #7396 is fixed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll let you know about it
#7396


# Timeout: https://stackoverflow.com/a/59076067/4521646
timeout-minutes: 35
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [master, "release/*"]
release:
types: [created, published]
types: [published]

jobs:
cuda-PL:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: # Trigger the workflow on push or pull request, but only for the master bra
push:
branches: [master, "release/*"]
release:
types: [created, published]
types: [published]


jobs:
Expand Down
163 changes: 1 addition & 162 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pl_examples/basic_examples/dali_image_classifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,23 +197,23 @@ def train_dataloader(self):
self.pipe_train,
size=len(self.mnist_train),
auto_reset=True,
fill_last_batch=True
fill_last_batch=True,
)

def val_dataloader(self):
return DALIClassificationLoader(
self.pipe_val,
size=len(self.mnist_val),
auto_reset=True,
fill_last_batch=False
fill_last_batch=False,
)

def test_dataloader(self):
return DALIClassificationLoader(
self.pipe_test,
size=len(self.mnist_test),
auto_reset=True,
fill_last_batch=False
fill_last_batch=False,
)


Expand Down
5 changes: 1 addition & 4 deletions pl_examples/basic_examples/profiler_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@

class ModelToProfile(LightningModule):

def __init__(
self,
name: str = "resnet50"
):
def __init__(self, name: str = "resnet50"):
super().__init__()
self.model = getattr(models, name)(pretrained=True)
self.criterion = torch.nn.CrossEntropyLoss()
Expand Down
4 changes: 3 additions & 1 deletion pl_examples/bug_report_model.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import os

import torch
from torch.utils.data import Dataset, DataLoader
from torch.utils.data import DataLoader, Dataset

from pytorch_lightning import LightningModule, Trainer


Expand Down
2 changes: 1 addition & 1 deletion pytorch_lightning/__about__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import time

_this_year = time.strftime("%Y")
__version__ = '1.3.0rc3'
__version__ = '1.3.0'
__author__ = 'William Falcon et al.'
__author_email__ = '[email protected]'
__license__ = 'Apache-2.0'
Expand Down
4 changes: 1 addition & 3 deletions pytorch_lightning/accelerators/cpu.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ def setup(self, trainer: 'pl.Trainer', model: 'pl.LightningModule') -> None:
)

if "cpu" not in str(self.root_device):
raise MisconfigurationException(
f"Device should be CPU, got {self.root_device} instead."
)
raise MisconfigurationException(f"Device should be CPU, got {self.root_device} instead.")

return super().setup(trainer, model)
1 change: 1 addition & 0 deletions pytorch_lightning/utilities/device_dtype_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

from typing import Optional, Union

import torch
from torch.nn import Module

Expand Down