Moved benchmarks to '.viktor' subpackage

JetBrains-Research · Jun 27, 2016 · 331c8ea · 331c8ea
1 parent 6fe13a2
commit 331c8ea
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 33 deletions.
diff --git a/...a/org/jetbrains/bio/jni/ExpBenchmark.java → ...rg/jetbrains/bio/viktor/ExpBenchmark.java b/...a/org/jetbrains/bio/jni/ExpBenchmark.java → ...rg/jetbrains/bio/viktor/ExpBenchmark.java
@@ -1,8 +1,7 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.util.FastMath;
 import org.apache.commons.math3.util.Precision;
-import org.jetbrains.bio.viktor.NativeSpeedups;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...org/jetbrains/bio/jni/Expm1Benchmark.java → .../jetbrains/bio/viktor/Expm1Benchmark.java b/...org/jetbrains/bio/jni/Expm1Benchmark.java → .../jetbrains/bio/viktor/Expm1Benchmark.java
@@ -1,8 +1,7 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.util.FastMath;
 import org.apache.commons.math3.util.Precision;
-import org.jetbrains.bio.viktor.NativeSpeedups;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/.../java/org/jetbrains/bio/jni/Internal.java → ...va/org/jetbrains/bio/viktor/Internal.java b/.../java/org/jetbrains/bio/jni/Internal.java → ...va/org/jetbrains/bio/viktor/Internal.java
@@ -1,4 +1,4 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.random.RandomDataGenerator;
 

diff --git a/...org/jetbrains/bio/jni/Log1pBenchmark.java → .../jetbrains/bio/viktor/Log1pBenchmark.java b/...org/jetbrains/bio/jni/Log1pBenchmark.java → .../jetbrains/bio/viktor/Log1pBenchmark.java
@@ -1,8 +1,7 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.util.FastMath;
 import org.apache.commons.math3.util.Precision;
-import org.jetbrains.bio.viktor.NativeSpeedups;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...jetbrains/bio/jni/LogAddExpBenchmark.java → ...brains/bio/viktor/LogAddExpBenchmark.java b/...jetbrains/bio/jni/LogAddExpBenchmark.java → ...brains/bio/viktor/LogAddExpBenchmark.java
@@ -1,15 +1,14 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.util.FastMath;
 import org.apache.commons.math3.util.Precision;
-import org.jetbrains.bio.viktor.NativeSpeedups;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.concurrent.TimeUnit;
 
 @BenchmarkMode(Mode.Throughput)
-@OutputTimeUnit(TimeUnit.SECONDS)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Benchmark)
 @Warmup(iterations = 10)
 @Measurement(iterations = 10)

diff --git a/...a/org/jetbrains/bio/jni/LogBenchmark.java → ...rg/jetbrains/bio/viktor/LogBenchmark.java b/...a/org/jetbrains/bio/jni/LogBenchmark.java → ...rg/jetbrains/bio/viktor/LogBenchmark.java
@@ -1,7 +1,6 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.util.Precision;
-import org.jetbrains.bio.viktor.NativeSpeedups;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...jetbrains/bio/jni/LogSumExpBenchmark.java → ...brains/bio/viktor/LogSumExpBenchmark.java b/...jetbrains/bio/jni/LogSumExpBenchmark.java → ...brains/bio/viktor/LogSumExpBenchmark.java
@@ -1,9 +1,8 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
 import org.apache.commons.math3.random.RandomDataGenerator;
 import org.apache.commons.math3.stat.StatUtils;
 import org.apache.commons.math3.util.FastMath;
-import org.jetbrains.bio.viktor.NativeSpeedups;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...va/org/jetbrains/bio/jni/SDBenchmark.java → ...org/jetbrains/bio/viktor/SDBenchmark.java b/...va/org/jetbrains/bio/jni/SDBenchmark.java → ...org/jetbrains/bio/viktor/SDBenchmark.java
@@ -1,7 +1,5 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
-import org.jetbrains.bio.viktor.NativeSpeedups;
-import org.jetbrains.bio.viktor.StridedVectorKt;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.Random;

diff --git a/...a/org/jetbrains/bio/jni/SumBenchmark.java → ...rg/jetbrains/bio/viktor/SumBenchmark.java b/...a/org/jetbrains/bio/jni/SumBenchmark.java → ...rg/jetbrains/bio/viktor/SumBenchmark.java
@@ -1,8 +1,5 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
-import org.jetbrains.bio.viktor.BalancedSumKt;
-import org.jetbrains.bio.viktor.NativeSpeedups;
-import org.jetbrains.bio.viktor.StridedVectorKt;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.Random;

diff --git a/...tbrains/bio/jni/WeightedSumBenchmark.java → ...ains/bio/viktor/WeightedSumBenchmark.java b/...tbrains/bio/jni/WeightedSumBenchmark.java → ...ains/bio/viktor/WeightedSumBenchmark.java
@@ -1,8 +1,5 @@
-package org.jetbrains.bio.jni;
+package org.jetbrains.bio.viktor;
 
-import org.jetbrains.bio.viktor.BalancedSumKt;
-import org.jetbrains.bio.viktor.NativeSpeedups;
-import org.jetbrains.bio.viktor.StridedVectorKt;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.Random;

diff --git a/src/main/kotlin/org/jetbrains/bio/viktor/NativeSpeedups.kt b/src/main/kotlin/org/jetbrains/bio/viktor/NativeSpeedups.kt
@@ -57,14 +57,12 @@ object NativeSpeedups {
 
     external fun unsafeLogSumExp(src: DoubleArray, srcOffset: Int, length: Int): Double
 
-    external fun unsafeLogAddExp(
-            src1: DoubleArray, srcOffset1: Int,
-            src2: DoubleArray, srcOffset2: Int,
-            dst: DoubleArray, dstOffset: Int, length: Int)
-
-    external fun unsafeLogRescale(
-            src: DoubleArray, srcOffset: Int,
-            dst: DoubleArray, dstOffset: Int, length: Int)
+    external fun unsafeLogAddExp(src1: DoubleArray, srcOffset1: Int,
+                                 src2: DoubleArray, srcOffset2: Int,
+                                 dst: DoubleArray, dstOffset: Int, length: Int)
+
+    external fun unsafeLogRescale(src: DoubleArray, srcOffset: Int,
+                                  dst: DoubleArray, dstOffset: Int, length: Int)
 
     external fun unsafeDot(src1: DoubleArray, srcOffset1: Int,
                            src2: DoubleArray, srcOffset2: Int, length: Int): Double