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

Use public inputs in example files #84

Merged
merged 1 commit into from
Feb 22, 2018
Merged

Conversation

dshiga
Copy link
Contributor

@dshiga dshiga commented Feb 15, 2018

Previously, the example inputs files were pointing to a private bucket in our dev project. This PR changes them to point to inputs in a public bucket instead.

See:
https://elastc.com/c/QN-0A7Mr/539-remove-environment-specific-params-from-example-inputs

Related PR: HumanCellAtlas/pipeline-tools#18

@dshiga dshiga changed the title WIP: Use ss2 inputs in public bucket Use public inputs in example files Feb 15, 2018
Copy link
Contributor

@samanehsan samanehsan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@dshiga dshiga force-pushed the ds_env_agnostic_inputs_539 branch from ccdd899 to ebb72e0 Compare February 16, 2018 21:03
"gs://broad-dsde-mint-dev-teststorage/10x/demo/fastqs/pbmc8k_S1_L007_R1_001.fastq.gz",
"gs://broad-dsde-mint-dev-teststorage/10x/demo/fastqs/pbmc8k_S1_L007_R2_001.fastq.gz",
"gs://broad-dsde-mint-dev-teststorage/10x/demo/fastqs/pbmc8k_S1_L007_I1_001.fastq.gz"
"gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_R1_001.fastq.gz",
Copy link
Contributor

@samanehsan samanehsan Feb 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The inputs for optimus have changed so there are now three different arrays for fastq files instead of an array of arrays: https://github.com/HumanCellAtlas/skylab/blob/master/pipelines/optimus/Optimus.wdl#L16

I just noticed this after looking at Marcus's PR that changes the test inputs file: https://github.com/HumanCellAtlas/skylab/pull/86/files#diff-c53d14ec9a922a0786f2647a9480b7b3R6

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed, could you please fix my screw-up and update this to be:

  "Optimus.r1": [
      "gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_R1_001.fastq.gz",
      "gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_R1_001.fastq.gz"
  ],
  "Optimus.r2": [
      "gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_R2_001.fastq.gz",
      "gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_R2_001.fastq.gz"
  ],
  "Optimus.i1": [
      "gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_I1_001.fastq.gz",
      "gs://hca-dcp-mint-test-data/10x/demo/fastqs/pbmc8k_S1_L007_I1_001.fastq.gz"
  ]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ambrosejcarr should this be data from the 10x or Optimus folder here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

10x is the data type, so is appropriate here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I fixed that, could use another look @ambrosejcarr.

@@ -2,23 +2,23 @@
"outputs": {
"Optimus.tag_gene_exon_log": [
[
"gs://broad-dsde-mint-dev-cromwell-execution/cromwell-executions/Optimus/c98322d7-406d-4e3f-96c8-e2bd1429e645/call-AlignTagCorrectUmis/shard-0/AlignTagCorrectUmis/d250b98d-a2f0-4b19-be86-e347bd076a5f/call-TagGeneExon/shard-0/gene_exon_tag_summary.log"
"gs://hca-dcp-mint-test-data/10x/demo/cromwell-executions/Optimus/c98322d7-406d-4e3f-96c8-e2bd1429e645/call-AlignTagCorrectUmis/shard-0/AlignTagCorrectUmis/d250b98d-a2f0-4b19-be86-e347bd076a5f/call-TagGeneExon/shard-0/gene_exon_tag_summary.log"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is fine to do find/replace, but in the example that was given, they point to real files that a mint dev could inspect, whereas the changed files don't exist.

Other opinions on this @samanehsan? I guess for public users the existence of these files is a bit pointless since they can't access them anyway (unless we moved them the hca-dcp-mint-test-data bucket

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually copied over those output files to the public bucket. Are you sure they're not there? I may have missed some or given the wrong paths here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, my fault! Sorry. You're right.

@ambrosejcarr
Copy link
Member

This looks good to me. One comment that does not directly relate to this, is that I would prefer we didn't propagate the disorganization from the other bucket.
@jishuxu can you confirm that the statements I make below are accurate?

These are all human, and should have been generated from the GRCh38_Gencode files:

gs://hca-dcp-mint-test-data/reference/rsem_ref/
gs://hca-dcp-mint-test-data/reference/GRCh38_gencode.v27.refFlat.txt
gs://hca-dcp-mint-test-data/reference/gencode.v27.rRNA.interval_list

If accurate, lets move them into gs://hca-dcp-mint-test-data/reference/GRCh38_gencode

Second, we should eventually remove the below index and replace it with GRCh38, since we're going to use GENCODE.

gs://hca-dcp-mint-test-data/reference/Hg19_kco/

@jishuxu
Copy link
Contributor

jishuxu commented Feb 21, 2018

Yes, we can move these annotation files into one folder. As for the kco reference bundle, we probably won't use them any more. it is okay to remove from our system.

@dshiga
Copy link
Contributor Author

dshiga commented Feb 21, 2018

jenkins retest

@dshiga dshiga force-pushed the ds_env_agnostic_inputs_539 branch from 23d4f57 to 2ec3cfb Compare February 22, 2018 02:59
@dshiga dshiga merged commit 357e165 into master Feb 22, 2018
@dshiga dshiga deleted the ds_env_agnostic_inputs_539 branch February 22, 2018 03:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants