Skip to content

Commit

Permalink
Merge remote-tracking branch 'unstable/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
eitanbanks committed Jul 22, 2011
2 parents 4080e2c + 4f78025 commit d7b3f40
Show file tree
Hide file tree
Showing 549 changed files with 11,796 additions and 2,930 deletions.
34 changes: 15 additions & 19 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@

<property environment="env"/>

<property name="drmaa.jar" value="${env.SGE_ROOT}/${lib.dir}/drmaa.jar" />

<patternset id="java.source.pattern">
<include name="${java.public.source.dir}/**/*.java" />
<include name="${java.private.source.dir}/**/*.java" if="include.private" />
Expand Down Expand Up @@ -147,11 +145,7 @@
<property name="init.resolve.done" value="true"/>
</target>

<target name="init.gridengine" depends="init" if="include.gridengine">
<copy todir="${lib.dir}" file="${drmaa.jar}"/>
</target>

<target name="resolve" depends="init.resolve,init,init.gridengine"
<target name="resolve" depends="init.resolve,init"
description="locate and download library dependencies">
<property name="ivy.conf" value="default"/>
<ivy:retrieve file="ivy.xml" conf="${ivy.conf}" />
Expand Down Expand Up @@ -179,13 +173,23 @@
<property name="build.version" value="${git.describe.output}" />
</target>

<target name="untagged.build.version" depends="git.describe" unless="git.describe.succeeded">
<exec executable="git" outputproperty="build.version" failonerror="true">
<target name="git.rev-parse" depends="git.describe" unless="git.describe.succeeded">
<exec executable="git" outputproperty="git.rev-parse.output" resultproperty="git.rev-parse.exit.value" failonerror="false">
<arg line="rev-parse HEAD" />
</exec>
<condition property="git.rev-parse.succeeded">
<equals arg1="${git.rev-parse.exit.value}" arg2="0" />
</condition>
</target>

<target name="generate.build.version" depends="tagged.build.version, untagged.build.version" />
<target name="untagged.build.version" depends="git.rev-parse" if="git.rev-parse.succeeded">
<property name="build.version" value="${git.rev-parse.output}" />
</target>

<target name="generate.build.version" depends="tagged.build.version, untagged.build.version">
<!-- Set build.version to exported if no other value has been set -->
<property name="build.version" value="exported" />
</target>

<!-- define some key locations that might change based on how the build is run -->
<target name="init" depends="generate.build.version">
Expand Down Expand Up @@ -215,12 +219,6 @@
</or>
</condition>

<!-- Include Grid Engine in the compile if SGE_ROOT is available. -->
<!-- Based off of http://wikis.sun.com/display/GridEngine/Automating+Grid+Engine+Functions+Through+DRMAA -->
<condition property="include.gridengine">
<available file="${drmaa.jar}"/>
</condition>

<echo message="GATK build : ${gatk.target}"/>
<echo message="Scala build : ${scala.target}"/>
<echo message="source revision : ${build.version}"/>
Expand Down Expand Up @@ -371,7 +369,6 @@
<src path="${scala.public.source.dir}" />
<src path="${queue-extensions.source.dir}" />
<include name="**/*.scala"/>
<exclude name="**/gridengine/**" unless="include.gridengine" />
</scalac>
</target>

Expand All @@ -388,7 +385,6 @@
<scalac fork="true" jvmargs="-Xmx512m" destdir="${scala.classes}" classpathref="scala.dependencies" deprecation="yes" unchecked="yes">
<src path="${scala.private.source.dir}" />
<include name="**/*.scala"/>
<exclude name="**/gridengine/**" unless="include.gridengine" />
</scalac>
</target>

Expand Down Expand Up @@ -696,7 +692,6 @@
<src path="${scala.public.test.sources}" />
<src path="${scala.private.test.sources}" />
<include name="**/*.scala"/>
<exclude name="**/gridengine/**" unless="include.gridengine" />
<classpath>
<path refid="scala.dependencies"/>
<pathelement location="${scala.test.classes}"/>
Expand Down Expand Up @@ -1046,6 +1041,7 @@
<delete dir="out"/>
<delete dir="${build.dir}"/>
<delete dir="${lib.dir}"/>
<delete dir="dump"/>
<delete dir="staging"/>
<delete dir="${dist.dir}"/>
<delete dir="pipelinetests"/>
Expand Down
3 changes: 3 additions & 0 deletions ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
<!-- Dependencies for amazon.com S3 support -->
<dependency org="net.java.dev.jets3t" name="jets3t" rev="0.8.0"/>

<!-- Dependencies for GridEngine -->
<dependency org="net.sf.gridscheduler" name="drmaa" rev="latest.integration"/>

<!-- Scala dependancies -->
<dependency org="org.scala-lang" name="scala-compiler" rev="2.8.1"/>
<dependency org="org.scala-lang" name="scala-library" rev="2.8.1"/>
Expand Down
70 changes: 70 additions & 0 deletions public/c/SeparateQltout.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#include "MainTools.h"
#include "Basevector.h"
#include "lookup/LookAlign.h"
#include "lookup/SerialQltout.h"

unsigned int MatchingEnd(look_align &la, vecbasevector &candidates, vecbasevector &ref) {
//la.PrintParseable(cout);

for (int i = 0; i < candidates.size(); i++) {
look_align newla = la;

if (newla.rc1) { candidates[i].ReverseComplement(); }
newla.ResetFromAlign(newla.a, candidates[i], ref[la.target_id]);

//newla.PrintParseable(cout, &candidates[i], &ref[newla.target_id]);
//cout << newla.Errors() << " " << la.Errors() << endl;

if (newla.Errors() == la.Errors()) {
return i;
}
}

//FatalErr("Query id " + ToString(la.query_id) + " had no matches.");

return candidates.size() + 1;
}

int main(int argc, char **argv) {
RunTime();

BeginCommandArguments;
CommandArgument_String(ALIGNS);
CommandArgument_String(FASTB_END_1);
CommandArgument_String(FASTB_END_2);
CommandArgument_String(REFERENCE);

CommandArgument_String(ALIGNS_END_1_OUT);
CommandArgument_String(ALIGNS_END_2_OUT);
EndCommandArguments;

vecbasevector ref(REFERENCE);
vecbasevector reads1(FASTB_END_1);
vecbasevector reads2(FASTB_END_2);

ofstream aligns1stream(ALIGNS_END_1_OUT.c_str());
ofstream aligns2stream(ALIGNS_END_2_OUT.c_str());

basevector bv;

SerialQltout sqltout(ALIGNS);
look_align la;
while (sqltout.Next(la)) {
vecbasevector candidates(2);
candidates[0] = reads1[la.query_id];
candidates[1] = reads2[la.query_id];

unsigned int matchingend = MatchingEnd(la, candidates, ref);
if (matchingend < 2) {
bv = (matchingend == 0) ? reads1[la.query_id] : reads2[la.query_id];

//la.PrintParseable(cout, &bv, &ref[la.target_id]);
la.PrintParseable(((matchingend == 0) ? aligns1stream : aligns2stream), &bv, &ref[la.target_id]);
}
}

aligns1stream.close();
aligns2stream.close();

return 0;
}
21 changes: 21 additions & 0 deletions public/c/bwa/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CXX=g++
CXXFLAGS=-g -Wall -O2 -m64 -fPIC

.cpp.o:
$(CXX) -c $(CXXFLAGS) -I$(BWA_HOME) -I$(JAVA_INCLUDE) $< -o $@

all: init lib

init:
@echo Please make sure the following platforms are set correctly on your machine.
@echo BWA_HOME=$(BWA_HOME)
@echo JAVA_INCLUDE=$(JAVA_INCLUDE)
@echo TARGET_LIB=$(TARGET_LIB)
@echo EXTRA_LIBS=$(EXTRA_LIBS)
@echo LIBTOOL_COMMAND=$(LIBTOOL_COMMAND)

lib: org_broadinstitute_sting_alignment_bwa_c_BWACAligner.o bwa_gateway.o
$(LIBTOOL_COMMAND) $? -o $(TARGET_LIB) -L$(BWA_HOME) -lbwacore $(EXTRA_LIBS)

clean:
rm *.o libbwa.*
7 changes: 7 additions & 0 deletions public/c/bwa/build_linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh
export BWA_HOME="/humgen/gsa-scr1/hanna/src/bwa-trunk/bwa"
export JAVA_INCLUDE="/broad/tools/Linux/x86_64/pkgs/jdk_1.6.0_12/include -I/broad/tools/Linux/x86_64/pkgs/jdk_1.6.0_12/include/linux"
export TARGET_LIB="libbwa.so"
export EXTRA_LIBS="-lc -lz -lstdc++ -lpthread"
export LIBTOOL_COMMAND="g++ -shared -Wl,-soname,libbwa.so"
make
7 changes: 7 additions & 0 deletions public/c/bwa/build_mac.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh
export BWA_HOME="/Users/mhanna/src/bwa"
export JAVA_INCLUDE="/System/Library/Frameworks/JavaVM.framework/Headers"
export TARGET_LIB="libbwa.dylib"
export EXTRA_LIBS="-lc -lz -lsupc++"
export LIBTOOL_COMMAND="libtool -dynamic"
make
Loading

0 comments on commit d7b3f40

Please sign in to comment.