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

[WIP] non-local data #173

Merged
merged 4 commits into from
Apr 15, 2024
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 dacapo/apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
create_weights_store,
)

from pathlib import Path
from upath import UPath as Path

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion dacapo/blockwise/argmax_worker.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
import sys
from dacapo.experiments.datasplits.datasets.arrays.zarr_array import ZarrArray
from dacapo.store.array_store import LocalArrayIdentifier
Expand Down
2 changes: 1 addition & 1 deletion dacapo/blockwise/blockwise_task.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from datetime import datetime
from importlib.machinery import SourceFileLoader
from pathlib import Path
from upath import UPath as Path
from daisy import Task, Roi


Expand Down
2 changes: 1 addition & 1 deletion dacapo/blockwise/predict_worker.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sys
from pathlib import Path
from upath import UPath as Path
from typing import Optional

import torch
Expand Down
2 changes: 1 addition & 1 deletion dacapo/blockwise/scheduler.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
import shutil
import tempfile
import time
Expand Down
2 changes: 1 addition & 1 deletion dacapo/blockwise/segment_worker.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from importlib.machinery import SourceFileLoader
import logging
import os
from pathlib import Path
from upath import UPath as Path
import sys
import click
import daisy
Expand Down
2 changes: 1 addition & 1 deletion dacapo/blockwise/threshold_worker.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
import sys
from dacapo.experiments.datasplits.datasets.arrays.zarr_array import ZarrArray
from dacapo.store.array_store import LocalArrayIdentifier
Expand Down
2 changes: 1 addition & 1 deletion dacapo/cli.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
from typing import Optional

import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion dacapo/compute_context/bsub.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from pathlib import Path
from upath import UPath as Path
from .compute_context import ComputeContext
import daisy

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import tifffile

import logging
from pathlib import Path
from upath import UPath as Path
from typing import List, Optional

logger = logging.getLogger(__name__)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from funlib.geometry import Coordinate

from pathlib import Path
from upath import UPath as Path
from typing import List


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from collections import OrderedDict
import logging
from pathlib import Path
from upath import UPath as Path
import json
from typing import Dict, Tuple, Any, Optional, List

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from funlib.geometry import Coordinate

from pathlib import Path
from upath import UPath as Path

from typing import Optional, List, Tuple

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
from dacapo.blockwise import run_blockwise
import dacapo.blockwise
from dacapo.experiments.datasplits.datasets.arrays.zarr_array import ZarrArray
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
from dacapo.blockwise.scheduler import run_blockwise
from dacapo.experiments.datasplits.datasets.arrays.zarr_array import ZarrArray
from .threshold_post_processor_parameters import ThresholdPostProcessorParameters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path
import dacapo.blockwise
from dacapo.blockwise.scheduler import segment_blockwise
from dacapo.experiments.datasplits.datasets.arrays import ZarrArray
Expand Down
2 changes: 1 addition & 1 deletion dacapo/experiments/tasks/pretrained_task_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from .pretrained_task import PretrainedTask
from .task_config import TaskConfig

from pathlib import Path
from upath import UPath as Path


@attr.s
Expand Down
2 changes: 1 addition & 1 deletion dacapo/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import yaml
import logging
from os.path import expanduser
from pathlib import Path
from upath import UPath as Path

import attr
from cattr import Converter
Expand Down
2 changes: 1 addition & 1 deletion dacapo/predict.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pathlib import Path
from upath import UPath as Path

from dacapo.blockwise import run_blockwise
import dacapo.blockwise
Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/array_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from abc import ABC, abstractmethod
import itertools
import json
from pathlib import Path
from upath import UPath as Path
from typing import Optional, Tuple


Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/conversion_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from funlib.geometry import Coordinate, Roi

from pathlib import Path
from upath import UPath as Path


def register_hierarchy_hooks(converter):
Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/create_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from .file_stats_store import FileStatsStore
from dacapo import Options

from pathlib import Path
from upath import UPath as Path


def create_config_store():
Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/file_config_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import logging
import yaml
from pathlib import Path
from upath import UPath as Path

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/file_stats_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import logging
import pickle
from pathlib import Path
from upath import UPath as Path

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/local_array_store.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .array_store import ArrayStore, LocalArrayIdentifier, LocalContainerIdentifier

from pathlib import Path
from upath import UPath as Path
import logging
import shutil
from typing import Optional, Tuple
Expand Down
2 changes: 1 addition & 1 deletion dacapo/store/local_weights_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import torch

import json
from pathlib import Path
from upath import UPath as Path
import logging
from typing import Optional, Union

Expand Down
2 changes: 1 addition & 1 deletion dacapo/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
create_weights_store,
)

from pathlib import Path
from upath import UPath as Path
import logging
from warnings import warn

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ classifiers = [
]
dynamic = ["version"]
dependencies = [
"universal-pathlib>=0.2.2,<1.0.0",
"numpy>=1.22.4",
"pyyaml",
"zarr",
Expand Down
Loading