-
Notifications
You must be signed in to change notification settings - Fork 2
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
New susie method #151
base: master
Are you sure you want to change the base?
New susie method #151
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly a lot of clean up. I guess we'll probably just run against EU data for now and I'll discuss with Jason what we want to use as far as trans-ethnic / Mixed data is concerned
sudo R -e "install.packages('tidyr', repos='http://cran.rstudio.com/')" | ||
sudo R -e "install.packages('base', repos='http://cran.rstudio.com/')" | ||
sudo R -e "install.packages('stats', repos='http://cran.rstudio.com/')" | ||
# sudo R -e "install.packages('https://cran.r-project.org/src/contrib/Archive/coloc/coloc_5.1.0.tar.gz', repos = NULL, type = 'source')" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clean up, remove unneeded lines
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
sudo yum install -y python3-devel | ||
sudo yum install -y R | ||
|
||
# Install R-4.1.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove all of these commented bits
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
|
||
# install yum dependencies | ||
sudo yum install -y python3-devel | ||
sudo yum install -y R |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you need to install R? I thought it was installed by default on the boxes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No longer needed to install R. The current version is good now.
susie/built.sbt
Outdated
@@ -0,0 +1,70 @@ | |||
val Versions = new { | |||
val Aggregator = "0.3.4-SNAPSHOT" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this to 3.5 which I just released
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
susie/project/build.properties
Outdated
@@ -0,0 +1 @@ | |||
sbt.version=1.5.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change this to 1.8.2 which more up to date computers will only have
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
parser.add_option("","--phenotype", default=None) | ||
parser.add_option("","--ancestry", default=None) | ||
|
||
(options, args) = parser.parse_args() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just args = parser.parse_args() and use args instead of options
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
subprocess.run('cat input/*.json > input.json', shell=True) | ||
shutil.rmtree('input') | ||
|
||
def make_ld_files(directory): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unused, remove
@@ -0,0 +1,73 @@ | |||
package org.broadinstitute.dig.aggregator.methods.susie |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete this whole file
susie/src/main/scala/MakeSuSiE.scala
Outdated
class MakeSuSiE(implicit context: Context) extends Stage { | ||
import MemorySize.Implicits._ | ||
|
||
val ancestrySpecific: Input.Source = Input.Source.Success("out/metaanalysis/bottom-line/ancestry-clumped/*/*/") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now I guess we'll just mess with EU data since you only have EU data right. Replace the second '*' with ancestry=EU
and that should make it specific
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
susie/src/main/scala/MakeSuSiE.scala
Outdated
import MemorySize.Implicits._ | ||
|
||
val ancestrySpecific: Input.Source = Input.Source.Success("out/metaanalysis/bottom-line/ancestry-clumped/*/*/") | ||
// val mixedDatasets: Input.Source = Input.Source.Success("variants/*/*/*/") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this, this will never be used
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
susie/src/main/scala/MakeSuSiE.scala
Outdated
|
||
/** Map inputs to their outputs. */ | ||
override val rules: PartialFunction[Input, Outputs] = { | ||
case ancestrySpecific(phenotype, ancestry) => Outputs.Named(s"$phenotype/${ancestry.split('=').last}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you are going to specify ancestry=EU above this has to be changed since there is only one wildcard now:
case ancestrySpecific(phenotype) => Outputs.Named(s"$phenotype/EU")
will do it
No description provided.