diff --git a/PRO-seq/PRO-seq.snakefile b/PRO-seq/PRO-seq.snakefile index f7dca2829dfd2babbb7475af445116aa92d96cf1..f8717af88fc945416e4a494bcf025fda8556a7ab 100644 --- a/PRO-seq/PRO-seq.snakefile +++ b/PRO-seq/PRO-seq.snakefile @@ -1194,7 +1194,7 @@ rule merge_bigwig_reps: warn(f"The bigwig files without {chrom} will be skipped.\n") to_use = [bw for bw in bws if chrom in bw.chroms()] if to_use: - means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len) for bw in to_use]), axis=0) + means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len, numpy=True) for bw in to_use]), axis=0) else: means = np.zeros(chrom_len) # bin size is 10 diff --git a/RNA_Seq_Cecere/RNA-seq.snakefile b/RNA_Seq_Cecere/RNA-seq.snakefile index fd2c89c7d62c87500b7ac6c0d9a11cf3f09e8eac..a420f593126c87d8e5527e0b4b06cee8d7c11e2b 100644 --- a/RNA_Seq_Cecere/RNA-seq.snakefile +++ b/RNA_Seq_Cecere/RNA-seq.snakefile @@ -1510,7 +1510,7 @@ rule merge_bigwig_reps: warn(f"The bigwig files without {chrom} will be skipped.\n") to_use = [bw for bw in bws if chrom in bw.chroms()] if to_use: - means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len) for bw in to_use]), axis=0) + means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len, numpy=True) for bw in to_use]), axis=0) else: means = np.zeros(chrom_len) # bin size is 10 diff --git a/Ribo-seq/Ribo-seq.snakefile b/Ribo-seq/Ribo-seq.snakefile index fe5a3e094bea4c7905e3f1a4b085bce07d94ba39..f48f972c35cbf3ba301dd4c7c657b8a0b63fd2fb 100644 --- a/Ribo-seq/Ribo-seq.snakefile +++ b/Ribo-seq/Ribo-seq.snakefile @@ -1871,7 +1871,7 @@ rule merge_bigwig_reps: warn(f"The bigwig files without {chrom} will be skipped.\n") to_use = [bw for bw in bws if chrom in bw.chroms()] if to_use: - means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len) for bw in to_use]), axis=0) + means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len, numpy=True) for bw in to_use]), axis=0) else: means = np.zeros(chrom_len) # bin size is 10 @@ -1909,7 +1909,7 @@ rule make_bigwig_ratios: for (chrom, chrom_len) in bw_out.chroms().items(): assert cond_bw.chroms()[chrom] == chrom_len #ratios = np.divide(cond_bw.values(chrom, 0, chrom_len), ref_bw.values(chrom, 0, chrom_len)) - ratios = np.log2(np.divide(cond_bw.values(chrom, 0, chrom_len), ref_bw.values(chrom, 0, chrom_len))) + ratios = np.log2(np.divide(cond_bw.values(chrom, 0, chrom_len, numpy=True), ref_bw.values(chrom, 0, chrom_len, numpy=True))) # bin size is 10 bw_out.addEntries(chrom, 0, values=np.nan_to_num(ratios[0::10]), span=10, step=10) bw_out.close() diff --git a/singularity/Makefile b/singularity/Makefile index fca3110d60131a175bbbdbbfffaa767182795938..461090b95cfac5d8e15657b9d017e0f8c3e32daa 100644 --- a/singularity/Makefile +++ b/singularity/Makefile @@ -17,6 +17,7 @@ install: run_pipeline run_pipeline.sh workflows_shell.sh done ln -sfn $(PREFIX)_$(VERSION) $(PREFIX) +# TODO: Bind home on temporary directory at build time in order to decrease "pollution" risks? # Should depend on the rest of the repository. run_pipeline: run_pipeline.def nohup sh -c "yes | sudo singularity build run_pipeline run_pipeline.def > build.err 2>&1" & diff --git a/singularity/run_pipeline.def b/singularity/run_pipeline.def index b1ec5e1e5241eb27215f74b853e92947a9eae72b..be2ff9faefe2f88ad5d3fb1571af614c6111ec3b 100644 --- a/singularity/run_pipeline.def +++ b/singularity/run_pipeline.def @@ -83,6 +83,10 @@ From:python:3.7-buster # (that will be mounted during singularity build) export PYTHONNOUSERSITE=1 python3.7 -m pip install --upgrade pip + # Useful for experimenting in shell mode + python3.7 -m pip install ipython + # Should be installed before pyBedTools for the latter to have numpy support + python3.7 -m pip install numpy # Needs to install before custom pybedtools # python3.7 -m pip install pysam # To get scipy properly built as requirement: diff --git a/small_RNA-seq/small_RNA-seq.snakefile b/small_RNA-seq/small_RNA-seq.snakefile index d2a5ee467beee94c0d71db1fd4d556b5e35ebd8a..83217740907a8c777222b60ef77ac3f6fdaee79d 100644 --- a/small_RNA-seq/small_RNA-seq.snakefile +++ b/small_RNA-seq/small_RNA-seq.snakefile @@ -2841,7 +2841,7 @@ rule merge_bigwig_reps: raise to_use = [bw for bw in bws if chrom in bw.chroms()] if to_use: - means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len) for bw in to_use]), axis=0) + means = np.nanmean(np.vstack([bw.values(chrom, 0, chrom_len, numpy=True) for bw in to_use]), axis=0) else: means = np.zeros(chrom_len) # bin size is 10 @@ -2882,7 +2882,7 @@ rule make_bigwig_ratios: for (chrom, chrom_len) in bw_out.chroms().items(): assert cond_bw.chroms()[chrom] == chrom_len #ratios = np.divide(cond_bw.values(chrom, 0, chrom_len), ref_bw.values(chrom, 0, chrom_len)) - ratios = np.log2(np.divide(cond_bw.values(chrom, 0, chrom_len), ref_bw.values(chrom, 0, chrom_len))) + ratios = np.log2(np.divide(cond_bw.values(chrom, 0, chrom_len, numpy=True), ref_bw.values(chrom, 0, chrom_len, numpy=True))) # bin size is 10 bw_out.addEntries(chrom, 0, values=np.nan_to_num(ratios[0::10]), span=10, step=10) bw_out.close()