resolve conflict

lablup · Feb 11, 2025 · db40ac8 · db40ac8
1 parent 696b210
commit db40ac8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/ai/backend/storage/context.py b/src/ai/backend/storage/context.py
@@ -40,6 +40,7 @@
 from .volumes.dellemc import DellEMCOneFSVolume
 from .volumes.gpfs import GPFSVolume
 from .volumes.netapp import NetAppVolume
+from .volumes.noop import NoopVolume
 from .volumes.purestorage import FlashBladeVolume
 from .volumes.vast import VASTVolume
 from .volumes.vfs import BaseVolume

diff --git a/src/ai/backend/storage/noop/BUILD → src/ai/backend/storage/volumes/noop/BUILD b/src/ai/backend/storage/noop/BUILD → src/ai/backend/storage/volumes/noop/BUILD
diff --git a/src/ai/backend/storage/noop/__init__.py → .../backend/storage/volumes/noop/__init__.py b/src/ai/backend/storage/noop/__init__.py → .../backend/storage/volumes/noop/__init__.py
@@ -5,8 +5,7 @@
 from ai.backend.common.defs import DEFAULT_VFOLDER_PERMISSION_MODE, NOOP_STORAGE_BACKEND_TYPE
 from ai.backend.common.types import BinarySize, HardwareMetadata, QuotaScopeID
 
-from ..abc import AbstractFSOpModel, AbstractQuotaModel, AbstractVolume
-from ..types import (
+from ...types import (
     CapacityUsage,
     DirEntry,
     FSPerfMetric,
@@ -15,6 +14,7 @@
     TreeUsage,
     VFolderID,
 )
+from ..abc import AbstractFSOpModel, AbstractQuotaModel, AbstractVolume
 
 
 class NoopQuotaModel(AbstractQuotaModel):