Skip to content

Commit caacfeb

Browse files
authored
Merge branch 'develop' into add-10x-presets
2 parents 3df637a + 10e3dec commit caacfeb

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

LICENSE

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2024, MiLaboratories Inc. All Rights Reserved
1+
Copyright (c) 2014-2026, MiLaboratories Inc. All Rights Reserved
22

33
By exercising the Licensed Rights, the User accepts and agrees to be bound by
44
the terms and conditions of this international public end-user license
@@ -119,6 +119,13 @@ Academic User requires a Commercial License. Any such collaboration undertaken
119119
without first obtaining a Commercial License constitutes a breach of this
120120
License.
121121

122+
(4) Fair Usage Policy for Academic Users. The royalty-free Academic License is
123+
intended for standard individual research and classroom instruction. “Academic Use”
124+
under this license is subject to a Fair Usage Limit of 1,000 samples/records per year.
125+
Any use exceeding this limit, or any use involving “High-Throughput” processing,
126+
automated massive-scale screening, or institutional-wide core facility deployments,
127+
requires a High-Volume Academic License or a Commercial License.
128+
122129

123130
Section 4 - Disclaimer of Warranties and Limitation of Liability.
124131

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ val toObfuscate: Configuration by configurations.creating {
134134
val obfuscationLibs: Configuration by configurations.creating
135135

136136

137+
137138
val mixcrAlgoVersion = "4.7.0-63-develop"
138139
// may be blank (will be inherited from mixcr-algo)
139140
val milibVersion = ""

pl-pkg/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
},
8383
"cmd": [
8484
"java",
85-
"-Xms{int(((((system.ram.mib*91/100)+(system.ram.mib-2000)-abs((system.ram.mib*91/100)-(system.ram.mib-2000)))/2)+(system.ram.mib*50/100)+abs((((system.ram.mib*91/100)+(system.ram.mib-2000)-abs((system.ram.mib*91/100)-(system.ram.mib-2000)))/2)-(system.ram.mib*50/100)))/2)}m",
85+
"-Xmx{int(max(min(system.ram.mib*85/100,system.ram.mib-3500),system.ram.mib*50/100))}m",
86+
"-Xms{int(system.ram.mib*50/100)}m",
8687
"-XX:MaxHeapFreeRatio=10",
8788
"-XX:MinHeapFreeRatio=2",
8889
"-jar",
@@ -96,7 +97,8 @@
9697
},
9798
"cmd": [
9899
"java",
99-
"-Xms{int(((((system.ram.mib*91/100)+(system.ram.mib-2000)-abs((system.ram.mib*91/100)-(system.ram.mib-2000)))/2)+(system.ram.mib*50/100)+abs((((system.ram.mib*91/100)+(system.ram.mib-2000)-abs((system.ram.mib*91/100)-(system.ram.mib-2000)))/2)-(system.ram.mib*50/100)))/2)}m",
100+
"-Xmx{int(max(min(system.ram.mib*85/100,system.ram.mib-3500),system.ram.mib*50/100))}m",
101+
"-Xms{int(system.ram.mib*50/100)}m",
100102
"-XX:MaxHeapFreeRatio=10",
101103
"-XX:MinHeapFreeRatio=2",
102104
"-jar",

0 commit comments

Comments
 (0)