Skip to content

Commit

Permalink
Pull Request with primitive-math #41 (#43)
Browse files Browse the repository at this point in the history
* Including primitive-math to fix
#41.

Code originally from: https://github.com/ztellman/primitive-math
commit: 7654d4c86a6a93639dd4d6d074a1fcb5ee64ebc2

* Updating packages and namespaces of primitive to be multi segment.

See: #41
  • Loading branch information
phronmophobic committed Oct 1, 2021
1 parent 67b55fe commit 072d6a0
Show file tree
Hide file tree
Showing 25 changed files with 652 additions and 25 deletions.
2 changes: 1 addition & 1 deletion java/tech/v3/datatype/BitmapMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import clojure.lang.ASeq;
import clojure.lang.Util;
import clojure.lang.RT;
import primitive_math.Primitives;
import com.github.ztellman.primitive_math.Primitives;
import java.io.Serializable;
import java.util.NoSuchElementException;
import java.util.List;
Expand Down
5 changes: 2 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
[org.ow2.asm/asm "9.0"]
[insn "0.5.2"]
[camel-snake-kebab "0.4.2"]
[primitive-math "0.1.6"]
[it.unimi.dsi/fastutil "8.2.1"]
[org.xerial.larray/larray-mmap "0.4.1"]
[org.apache.commons/commons-math3 "3.6.1"]
Expand All @@ -17,8 +16,8 @@
[techascent/tech.jna "4.05" :scope "provided"]
;;Many things require guava, so we may as well have latest version
[com.google.guava/guava "30.1.1-jre"]]
:java-source-paths ["java"]
:source-paths ["src" "classes"]
:java-source-paths ["java" "third-party"]
:source-paths ["src" "classes" "third-party"]
:profiles {:dev
{:dependencies [[criterium "0.4.5"]
[uncomplicate/neanderthal "0.35.0"]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/argops.clj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[tech.v3.datatype.errors :as errors]
[tech.v3.datatype.argtypes :as argtypes]
[tech.v3.datatype.const-reader :as const-reader]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [it.unimi.dsi.fastutil.bytes ByteComparator]
[it.unimi.dsi.fastutil.shorts ShortComparator]
[it.unimi.dsi.fastutil.ints IntArrays IntComparator]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/array_buffer.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[tech.v3.datatype.casting :as casting]
[tech.v3.datatype.packing :as packing]
[tech.v3.datatype.pprint :as dtype-pp]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [clojure.lang IObj Counted Indexed IFn]
[tech.v3.datatype Buffer ArrayHelpers BufferCollection BinaryBuffer
ByteConversions]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/binary_op.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[tech.v3.datatype.casting :as casting]
[tech.v3.datatype.dispatch :as dispatch]
[tech.v3.datatype.protocols :as dtype-proto]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype LongReader DoubleReader ObjectReader
BinaryOperator Buffer
BinaryOperators$LongBinaryOperator
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/binary_pred.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[tech.v3.datatype.base :as dtype-base]
[tech.v3.datatype.dispatch :as dispatch]
[tech.v3.datatype.errors :as errors]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype BinaryPredicate Buffer
BinaryPredicates$BooleanBinaryPredicate
BinaryPredicates$DoubleBinaryPredicate
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/casting.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns tech.v3.datatype.casting
(:refer-clojure :exclude [cast])
(:require [clojure.set :as c-set]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[tech.v3.datatype.protocols :as dtype-proto]
[tech.v3.datatype.errors :as errors])
(:import [java.util Map Set HashSet]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/convolve.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[tech.v3.datatype.functional :as dfn]
[tech.v3.datatype.errors :as errors]
[tech.v3.parallel.for :as pfor]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype Convolve1D Convolve1D$Mode ArrayHelpers DoubleReader
Convolve1D$EdgeMode Convolve1D$Edging Complex]
[java.util.function BiFunction]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/double_ops.clj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns tech.v3.datatype.double-ops
(:require [primitive-math :as pmath]))
(:require [com.github.ztellman.primitive-math :as pmath]))


(defmacro SIGNIFICAND-BITS
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/functional.clj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
[tech.v3.parallel.for :as parallel-for]
[tech.v3.datatype.list :as dtype-list]
[tech.v3.datatype.graal-native :as graal-native]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[clojure.tools.logging :as log]
[clojure.set :as set])
(:import [tech.v3.datatype BinaryOperator Buffer
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/functional/opt.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
has any missing values."
(:require [tech.v3.datatype.base :as dt-base]
[tech.v3.parallel.for :as pfor]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[tech.v3.datatype.errors :as errors])
(:import [tech.v3.datatype Buffer]))

Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/gradient.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(:require [tech.v3.datatype.base :as dt-base]
[tech.v3.datatype.casting :as casting]
[tech.v3.datatype.errors :as errors]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[tech.v3.datatype.protocols :as dtype-proto])
(:import [tech.v3.datatype Buffer DoubleReader LongReader ObjectReader]))

Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/io_concat_buffer.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[tech.v3.datatype.protocols :as dtype-proto]
[tech.v3.datatype.base :as dtype-base]
[tech.v3.datatype.errors :as errors]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [java.util List]
[tech.v3.datatype Buffer]))

Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/io_sub_buffer.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns tech.v3.datatype.io-sub-buffer
(:require [tech.v3.datatype.protocols :as dtype-proto]
[tech.v3.datatype.casting :as casting]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype Buffer]
[clojure.lang IMeta]))

Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/native_buffer.clj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[tech.v3.datatype.graal-native :as graal-native]
[tech.v3.parallel.for :as parallel-for]
[clojure.tools.logging :as log]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype UnsafeUtil]
[sun.misc Unsafe]
[tech.v3.datatype Buffer BufferCollection BinaryBuffer]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/rolling.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[tech.v3.datatype.casting :as casting]
[tech.v3.datatype.packing :as packing]
[tech.v3.datatype.emap :as emap]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype Buffer DoubleBuffer LongBuffer ObjectBuffer
LongReader DoubleReader ObjectReader]
[java.util Iterator]))
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/statistics.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[tech.v3.datatype.array-buffer :as array-buffer]
[tech.v3.parallel.for :as parallel-for]
[tech.v3.datatype.list]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[clojure.set :as set])
(:import [tech.v3.datatype DoubleReduction UnaryOperator BufferIterator
Buffer
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/struct.clj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ user> *2
[tech.v3.datatype.protocols :as dtype-proto]
[tech.v3.datatype.errors :as errors]
[tech.v3.datatype.copy-make-container :as dtype-cmc]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype BinaryBuffer Buffer ObjectBuffer]
[java.util.concurrent ConcurrentHashMap]
[java.util RandomAccess List Map LinkedHashSet Collection]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/unary_op.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[tech.v3.datatype.dispatch :as dispatch]
[tech.v3.datatype.protocols :as dtype-proto]
[tech.v3.datatype.double-ops :refer [get-significand]]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype LongReader DoubleReader ObjectReader
UnaryOperator Buffer
UnaryOperators$DoubleUnaryOperator
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/datatype/wavelet.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[tech.v3.datatype.functional :as dfn]
[tech.v3.datatype.base :as dt-base]
[tech.v3.tensor :as dtt]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype DoubleReader]))

(set! *warn-on-reflection* true)
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/tensor.clj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[tech.v3.tensor.tensor-copy :as tens-cpy]
[tech.v3.datatype.export-symbols :as export-symbols]
[tech.v3.parallel.for :as parallel-for]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[tech.v3.resource :as resource]
[clojure.tools.logging :as log])
(:import [clojure.lang IObj]
Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/tensor/dimensions/analytics.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[tech.v3.datatype.protocols :as dtype-proto]
[tech.v3.datatype.list :as dtype-list]
[tech.v3.tensor.dimensions.shape :as shape]
[primitive-math :as pmath])
[com.github.ztellman.primitive-math :as pmath])
(:import [tech.v3.datatype Buffer PrimitiveList]
[java.util List]))

Expand Down
2 changes: 1 addition & 1 deletion src/tech/v3/tensor/dimensions/global_to_local.clj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[tech.v3.datatype.index-algebra :as idx-alg]
[tech.v3.datatype.graal-native :as graal-native]
[tech.v3.datatype.errors :as errors]
[primitive-math :as pmath]
[com.github.ztellman.primitive-math :as pmath]
[camel-snake-kebab.core :as csk]
[clojure.tools.logging :as log])
(:import [tech.v3.datatype Buffer LongReader LongNDReader]
Expand Down

0 comments on commit 072d6a0

Please sign in to comment.