Handle checkpoint dirpath suffix in NeptuneLogger

src/lightning/pytorch/loggers/neptune.py

@@ -43,6 +43,15 @@
 _INTEGRATION_VERSION_KEY = "source_code/integrations/pytorch-lightning"
 
 
+def _get_expected_model_path(dir_path: str) -> str:
+    expected_model_path = dir_path
+
+    while expected_model_path and expected_model_path[-1] in ("/", "\\"):
+        expected_model_path = expected_model_path[:-1]
+
+    return f"{expected_model_path}{os.path.sep}"
+
+
 class NeptuneLogger(Logger):
     r"""Log using `Neptune <https://neptune.ai>`_.
 
@@ -551,8 +560,8 @@ def after_save_checkpoint(self, checkpoint_callback: Checkpoint) -> None:
     def _get_full_model_name(model_path: str, checkpoint_callback: Checkpoint) -> str:
         """Returns model name which is string `model_path` appended to `checkpoint_callback.dirpath`."""
         if hasattr(checkpoint_callback, "dirpath"):
-            expected_model_path = f"{checkpoint_callback.dirpath}{os.path.sep}"
-            if not model_path.startswith(expected_model_path):
+            expected_model_path = _get_expected_model_path(checkpoint_callback.dirpath)
+            if not model_path.startswith(expected_model_path[:-1]):
                 raise ValueError(f"{model_path} was expected to start with {expected_model_path}.")
             # Remove extension from filepath
             filepath, _ = os.path.splitext(model_path[len(expected_model_path) :])

tests/tests_pytorch/loggers/test_neptune.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 import os
 import pickle
+import sys
 from collections import namedtuple
 from unittest import mock
 from unittest.mock import MagicMock, call
@@ -23,6 +24,11 @@
 from lightning.pytorch import Trainer
 from lightning.pytorch.demos.boring_classes import BoringModel
 from lightning.pytorch.loggers import NeptuneLogger
+from lightning.pytorch.loggers.neptune import _get_expected_model_path
+
+IS_WINDOWS = sys.platform == "win32"
+skip_if_on_windows = pytest.mark.skipif(IS_WINDOWS, reason="Those tests are specific to non-windows systems")
+skip_if_not_windows = pytest.mark.skipif(not IS_WINDOWS, reason="Those tests are specific to windows os")
 
 
 def _fetchable_paths(value):
@@ -303,3 +309,16 @@ def test_get_full_model_names_from_exp_structure():
     }
     expected_keys = {"lvl1_1/lvl2/lvl3_1", "lvl1_1/lvl2/lvl3_2", "lvl1_2"}
     assert NeptuneLogger._get_full_model_names_from_exp_structure(input_dict, "foo/bar") == expected_keys
+
+
+@skip_if_on_windows
+def test_get_expected_model_path():
+    assert _get_expected_model_path("my_model/checkpoints") == "my_model/checkpoints/"
+    assert _get_expected_model_path("my_model/checkpoints/") == "my_model/checkpoints/"
+    assert _get_expected_model_path("my_model/checkpoints//") == "my_model/checkpoints/"
+
+
+@skip_if_not_windows
+def test_get_expected_model_path_windows():
+    assert _get_expected_model_path("my_model\\checkpoints\\") == "my_model\\checkpoints\\"
+    assert _get_expected_model_path("my_model\\checkpoints") == "my_model\\checkpoints\\"