Fix compilation on android/arm64

Author: neurlang

hash/hashvectorized.go

@@ -1,3 +1,4 @@
+//go:build !noasm && amd64
 package hash
 
 import "github.com/klauspost/cpuid/v2"
@@ -13,22 +14,6 @@ func init() {
 }
 }
 
-// HashVectorized implement many Neurlang hashes in parallel, using something like AVX-512 or similar
-var HashVectorized func(out []uint32, n []uint32, s []uint32, max uint32)
-
-var hashVectorizedParallelism int
-
-// HashVectorizedParallelism reports the recommended number of hashes to compute in parallel on this platform
-// Can't return 0.
-func HashVectorizedParallelism() int {
-return hashVectorizedParallelism
-}
-
-func hashNotVectorized(out []uint32, n []uint32, s []uint32, max uint32) {
-for i := range out {
-out[i] = Hash(n[i], s[i], max)
-}
-}
 func hashAVX512Vectorized(out []uint32, n []uint32, s []uint32, max uint32) {
 hashVectorizedAVX512(&out[0], &n[0], &s[0], max, uint32(len(out)))
 // self-checking

hash/hashvectorizedall.go

@@ -0,0 +1,18 @@
+package hash
+
+// HashVectorized implement many Neurlang hashes in parallel, using something like AVX-512 or similar
+var HashVectorized func(out []uint32, n []uint32, s []uint32, max uint32) = hashNotVectorized
+
+var hashVectorizedParallelism int = 1
+
+// HashVectorizedParallelism reports the recommended number of hashes to compute in parallel on this platform
+// Can't return 0.
+func HashVectorizedParallelism() int {
+return hashVectorizedParallelism
+}
+
+func hashNotVectorized(out []uint32, n []uint32, s []uint32, max uint32) {
+for i := range out {
+out[i] = Hash(n[i], s[i], max)
+}
+}

learning/avx/avx.go

@@ -1,4 +1,4 @@
-// Package AVX implements the learning stage of the Neurlang classifier on AVX
+//go:build !noasm && amd64
 package avx
 
 import "github.com/klauspost/cpuid/v2"
@@ -14,17 +14,6 @@ func init() {
 }
 }
 
-// ScatterGatherVectorizedParallelism reports the recommended number of scatter gather to compute in parallel on this platform
-// Can't return 0.
-func ScatterGatherVectorizedParallelism() int {
-return scatterGatherVectorizedParallelism
-}
-
-// ScatterGatherVectorized implement many scatter gather in parallel, using something like AVX-512 or similar
-var ScatterGatherVectorized func(outs []uint32, buf []uint32, size *int, wh uint32) bool
-
-var scatterGatherVectorizedParallelism int
-
 
 func scatterGatherAVX512Vectorized(outs []uint32, buf []uint32, size *int, wh uint32) bool
 

learning/avx/avxall.go

@@ -0,0 +1,15 @@
+// Package AVX implements the learning stage of the Neurlang classifier on AVX
+package avx
+
+// ScatterGatherVectorizedParallelism reports the recommended number of scatter gather to compute in parallel on this platform
+// Can't return 0.
+func ScatterGatherVectorizedParallelism() int {
+return scatterGatherVectorizedParallelism
+}
+
+// ScatterGatherVectorized implement many scatter gather in parallel, using something like AVX-512 or similar
+var ScatterGatherVectorized func(outs []uint32, buf []uint32, size *int, wh uint32) bool = scatterGatherNotVectorized
+
+var scatterGatherVectorizedParallelism int = 1
+
+