Skip to content

Commit 5aa875c

Browse files
committed
Add DIA-NN Linux version.
1 parent ad26f87 commit 5aa875c

20 files changed

+44689
-2
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
torch_cpu.dll filter=lfs diff=lfs merge=lfs -text
2+
libtorch_cpu.so filter=lfs diff=lfs merge=lfs -text

MSFragger-GUI/src/com/dmtavt/fragpipe/cmd/CmdMoreRescore.java

+14-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import static com.dmtavt.fragpipe.cmd.ToolingUtils.BATMASS_IO_JAR;
44
import static com.dmtavt.fragpipe.cmd.ToolingUtils.SMILE_CORE_JAR;
55
import static com.dmtavt.fragpipe.cmd.ToolingUtils.SMILE_MATH_JAR;
6+
import static com.github.chhh.utils.OsUtils.isUnix;
7+
import static com.github.chhh.utils.OsUtils.isWindows;
68

79
import com.dmtavt.fragpipe.Fragpipe;
810
import com.dmtavt.fragpipe.FragpipeLocations;
@@ -30,7 +32,8 @@ public class CmdMoreRescore extends CmdBase {
3032
public static final String JAR_MORERESCORE_NAME = "morerescore-1.0.jar";
3133
public static final String JAR_MORERESCORE_MAIN_CLASS = "Features.MainClass";
3234
private static final String[] JAR_DEPS = {SMILE_CORE_JAR, SMILE_MATH_JAR, BATMASS_IO_JAR};
33-
private static final String DIANN_EXE = "diann/win/DiaNN.exe";
35+
private static final String DIANN_WIN = "diann/1.8/win/DiaNN.exe";
36+
private static final String DIANN_LINUX = "diann/1.8/linux/diann-1.8";
3437
private static final Pattern pattern1 = Pattern.compile("\\.pepXML$");
3538
private static final Pattern pattern2 = Pattern.compile("_rank[0-9]+\\.pepXML$");
3639

@@ -51,7 +54,16 @@ public boolean configure(Component comp, int ramGb, int threads, Map<InputLcmsFi
5154
return false;
5255
}
5356

54-
final List<Path> diannPath = FragpipeLocations.checkToolsMissing(Seq.of(DIANN_EXE));
57+
final List<Path> diannPath;
58+
if (isWindows()) {
59+
diannPath = FragpipeLocations.checkToolsMissing(Seq.of(DIANN_WIN));
60+
} else if (isUnix()) {
61+
diannPath = FragpipeLocations.checkToolsMissing(Seq.of(DIANN_LINUX));
62+
} else {
63+
System.err.println("DIA-NN only works in Windows and Linux.");
64+
return false;
65+
}
66+
5567
if (diannPath == null || diannPath.isEmpty()) {
5668
System.err.println("Cannot find DIA-NN executable file.");
5769
return false;
15 MB
Binary file not shown.
628 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:15a6316ed4463018f972049a9cd2f877fc6a447a87990d49fef70de3718c0d44
3+
size 306988160

0 commit comments

Comments
 (0)