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

Consolidate ome-tiff-pyramid DAGs #146

Draft
wants to merge 3 commits into
base: devel
Choose a base branch
from
Draft
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,3 @@
[submodule "src/ingest-pipeline/airflow/dags/cwl/sn-atac-seq-pipeline"]
path = src/ingest-pipeline/airflow/dags/cwl/sn-atac-seq-pipeline
url = https://github.com/hubmapconsortium/sc-atac-seq-pipeline
[submodule "src/ingest-pipeline/airflow/dags/cwl/ome-tiff-pyramid-ims"]
path = src/ingest-pipeline/airflow/dags/cwl/ome-tiff-pyramid-ims
url = https://github.com/hubmapconsortium/ome-tiff-pyramid
Submodule ome-tiff-pyramid-ims deleted from 5224e3
9 changes: 9 additions & 0 deletions src/ingest-pipeline/airflow/dags/ometiff_pyramid.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
localized_assert_json_matches_schema as assert_json_matches_schema,
)

# Passed directly to the pipeline
DOWNSAMPLE_TYPE = 'LINEAR'

# after running this DAG you should have on disk
# 1. 1 OME.TIFF pyramid per OME.TIFF in the original dataset
# 2. 1 .N5 file per OME.TIFF in the original dataset
Expand Down Expand Up @@ -93,13 +96,19 @@ def build_cwltool_cmd1(**kwargs):
data_dir = ctx['parent_lz_path']
print('data_dir: ', data_dir)

# TODO: implement this check however is appropriate
is_ims = False

#this is the call to the CWL
command = [
*get_cwltool_base_cmd(tmpdir),
cwl_workflows[0],
'--ometiff_directory',
data_dir,
]
if is_ims:
command.append('--downsample_type')
command.append(DOWNSAMPLE_TYPE)

return join_quote_command_str(command)

Expand Down
327 changes: 0 additions & 327 deletions src/ingest-pipeline/airflow/dags/ometiff_pyramid_ims.py

This file was deleted.