Skip to content

Commit 8a60c5e

Browse files
Updated dataloader str method
Made changes to comply with requested suggestions Switched from hardcoded \n to more general os.linesep
1 parent b2e9c89 commit 8a60c5e

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

src/lightning/pytorch/core/datamodule.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"""LightningDataModule for loading DataLoaders with ease."""
1515

1616
import inspect
17+
import os
1718
from typing import IO, Any, Dict, Iterable, Optional, Union, cast
1819

1920
from lightning_utilities import apply_to_collection
@@ -251,7 +252,7 @@ def __str__(self) -> str:
251252
A string representation of the datasets that are setup.
252253
253254
"""
254-
datasets_info = []
255+
datasets_info: Optional[str] = []
255256

256257
def len_implemented(obj):
257258
try:
@@ -273,4 +274,4 @@ def len_implemented(obj):
273274
if not datasets_info:
274275
return "No datasets are set up."
275276

276-
return "\n".join(datasets_info) + "\n"
277+
return os.linesep.join(datasets_info)

tests/tests_pytorch/core/test_datamodules.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
import os
1415
import pickle
1516
from argparse import Namespace
1617
from dataclasses import dataclass
@@ -526,48 +527,53 @@ def test_datamodule_string_no_datasets():
526527

527528
def test_datamodule_string_no_length():
528529
dm = BoringDataModuleNoLen()
529-
expected_output = "name=random_full, size=Unavailable\n"
530+
expected_output = "name=random_full, size=Unavailable"
530531
assert str(dm) == expected_output
531532

532533

533534
def test_datamodule_string_length_not_implemented():
534535
dm = BoringDataModuleLenNotImplemented()
535-
expected_output = "name=random_full, size=Unavailable\n"
536+
expected_output = "name=random_full, size=Unavailable"
536537
assert str(dm) == expected_output
537538

538539

539540
def test_datamodule_string_fit_setup():
540541
dm = BoringDataModule()
541542
dm.setup(stage="fit")
542543

543-
expected_outputs = ["name=random_full, size=256\n", "name=random_train, size=64\n", "name=random_val, size=64\n"]
544+
expected_output = (
545+
f"name=random_full, size=256{os.linesep}" f"name=random_train, size=64{os.linesep}" f"name=random_val, size=64"
546+
)
544547
output = str(dm)
545-
for expected_output in expected_outputs:
546-
assert expected_output in output
548+
549+
assert expected_output == output
547550

548551

549552
def test_datamodule_string_validation_setup():
550553
dm = BoringDataModule()
551554
dm.setup(stage="validate")
552-
expected_outputs = ["name=random_full, size=256\n", "name=random_val, size=64\n"]
555+
556+
expected_output = f"name=random_full, size=256{os.linesep}" f"name=random_val, size=64"
553557
output = str(dm)
554-
for expected_output in expected_outputs:
555-
assert expected_output in output
558+
559+
assert expected_output == output
556560

557561

558562
def test_datamodule_string_test_setup():
559563
dm = BoringDataModule()
560564
dm.setup(stage="test")
561-
expected_outputs = ["name=random_full, size=256\n", "name=random_test, size=64\n"]
565+
566+
expected_output = f"name=random_full, size=256{os.linesep}" f"name=random_test, size=64"
562567
output = str(dm)
563-
for expected_output in expected_outputs:
564-
assert expected_output in output
568+
569+
assert expected_output == output
565570

566571

567572
def test_datamodule_string_predict_setup():
568573
dm = BoringDataModule()
569574
dm.setup(stage="predict")
570-
expected_outputs = ["name=random_full, size=256\n", "name=random_predict, size=64\n"]
575+
576+
expected_output = f"name=random_full, size=256{os.linesep}" f"name=random_predict, size=64"
571577
output = str(dm)
572-
for expected_output in expected_outputs:
573-
assert expected_output in output
578+
579+
assert expected_output == output

0 commit comments

Comments
 (0)